Skip to content

Conversation

brianmichel
Copy link
Contributor

Looks like there was just part of a conflict marker in the README file, so I figured I'd remove it.

Looks like there was just part of a conflict marker in the README file, so I figured I'd remove it.
@elithrar
Copy link
Contributor

Good catch, thanks!

@elithrar elithrar merged commit 85b8c20 into gorilla:master May 23, 2017
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