Don't render markdown in conflict example #9

Merged
merged 1 commit into from Apr 3, 2013

Conversation

Projects
None yet
2 participants
@jenshnielsen
Collaborator

jenshnielsen commented Apr 3, 2013

No description provided.

jamespjh added a commit that referenced this pull request Apr 3, 2013

Merge pull request #9 from UCL/git3
Don't render markdown in conflict example

@jamespjh jamespjh merged commit 8c2439d into master Apr 3, 2013

@kynan kynan deleted the git3 branch Apr 4, 2013

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