Ugh, can't figure out how to make these merge.

ropensci / neotoma

Programmatic R interface to the Neotoma Paleoecological Database.

https://docs.ropensci.org/neotoma

Other

30 stars 16 forks source link

Ugh, can't figure out how to make these merge. #86

Closed SimonGoring closed 10 years ago

SimonGoring commented 10 years ago

Once again I've screwed myself by trying to push too many changes at one time. Some big changes here, but I'm not sure where the merge conflict is, or how to resolve it in this case.

karthik commented 10 years ago

Going to fix this shortly @SimonGoring. Hang on.

karthik commented 10 years ago

I merged all locally into a new branch. I'll send a pull request to master shortly. You should be able to merge automatically. Then you can delete this PR.