Skip to content

Conversation

@bthibault
Copy link

Notes:

I didn't see any tests for conflict resolution strategies, so I didn't do anything there.

I don't know if we also need to update nools.min or not.

Let me know and I can adjust the PR.

@doug-martin doug-martin added this to the v1.0.0 milestone Jan 21, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants