search

willpearse / MADtraits

Make A Database of trait data
Other
10 stars 39 forks source link

Pull me! #57

Closed mahagadorn closed 7 years ago

willpearse commented 7 years ago

Mal, there are a load of conflicts here and I'm not sure how to merge them. Could you go through and take a look?

Leave anything that's "g/m" as that, don't change them to "g m^-1". I realise that's what we were doing before, but it's not what we're doing now. Don't go to any trouble over it, but if you're going through and you notice any don't bother changing them.

mahagadorn commented 7 years ago

Hmmmm conflicts? Okay I can check...Can you give me an idea of what the conflicts are? They were working fine in my computer.

On Apr 9, 2017 6:11 PM, "Will Pearse" notifications@github.com wrote:

Mal, there are a load of conflicts here and I'm not sure how to merge them. Could you go through and take a look?

Leave anything that's "g/m" as that, don't change them to "g m^-1". I realise that's what we were doing before, but it's not what we're doing now. Don't go to any trouble over it, but if you're going through and you notice any don't bother changing them.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/willpearse/natdb/pull/57#issuecomment-292823581, or mute the thread https://github.com/notifications/unsubscribe-auth/AVdhqx-D62Rd51RCj_pNsHmIsqrjPrTMks5ruXPKgaJpZM4M3mmE .

willpearse commented 7 years ago

Don't worry about it - we can deal with it once I'm back from this meeting. It's not a big deal :D