Skip to content

Conversation

@EmyrClement
Copy link
Contributor

So conflicts.

@Lana-B
Copy link
Contributor

Lana-B commented Feb 13, 2015

You love the drama

@EmyrClement
Copy link
Contributor Author

I have fixed the stupid conflicts Luke put in.

@kreczko
Copy link
Contributor

kreczko commented Feb 16, 2015

No you haven't. There are more of them.

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.

3 participants