Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote branch 'upstream/master'

Conflicts:
	README.markdown
  • Loading branch information...
commit 9f6205c7af3e8ea35041efd8e1f17454c7406ee7 2 parents 356269e + f412f99
Jonathan H. Wage jwage authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  README.markdown
2  README.markdown
View
@@ -107,4 +107,4 @@ like the following:
<user>
<id>1</id>
<username>jwage</username>
- </user>
+ </user>
Please sign in to comment.
Something went wrong with that request. Please try again.