Resolve merge conflicts

barbagroup / geoclaw

A fork of GeoClaw (http://www.clawpack.org/geoclaw) for hydrocarbon overland flow

BSD 3-Clause "New" or "Revised" License

3 stars 3 forks source link

Resolve merge conflicts #20

Closed piyueh closed 5 years ago

piyueh commented 5 years ago

This PR tries to resolve the conflict when trying to merge our branch back to upstream. The only change in this PR is the ignored patterns in the .gitignore file.

Given this PR has very few changes and only has changes in .gitignore, so I'll merge it directly without reviewers' approval.