Remove merge conflict remnant from readme #118

Merged
merged 1 commit into from Dec 20, 2013

Conversation

Projects
None yet
2 participants
Contributor

terite commented Dec 10, 2013

No description provided.

@beberlei beberlei added a commit that referenced this pull request Dec 20, 2013

@beberlei beberlei Merge pull request #118 from terite/patch-1
Remove merge conflict remnant from readme
5e4ec9c

@beberlei beberlei merged commit 5e4ec9c into beberlei:master Dec 20, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment