Skip to content

Conversation

@ryanbanderson
Copy link
Contributor

No description provided.

@nmanaud
Copy link
Member

nmanaud commented Jun 14, 2017

I can't seem to able to merge your pull request as it says "This branch has conflicts that must be resolved"... and I don't know how to resolve them.

@ryanbanderson
Copy link
Contributor Author

Ok, I think I resolved everything

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