Fix merge conflict in readme.

bradyvercher · bradyvercher · commit 9f21848a3fa1 · 2013-05-24T17:07:30.000-07:00
diff --git a/README.md b/README.md
@@ -157,4 +157,4 @@ add_filter( 'gistpress_highlight_color', '__return_false' );
 
 ## Credits ##
 
-Built by [Brady Vercher](https://twitter.com/bradyvercher) & [Gary Jones](https://twitter.com/GaryJ)
+Built by [Brady Vercher](https://twitter.com/bradyvercher) & [Gary Jones](https://twitter.com/GaryJ)

Original file line number	Diff line number	Diff line change
`@@ -157,4 +157,4 @@ add_filter( 'gistpress_highlight_color', '__return_false' );`
`157`	`157`
`158`	`158`	`## Credits ##`
`159`	`159`
`160`		`-Built by [Brady Vercher](https://twitter.com/bradyvercher) & [Gary Jones](https://twitter.com/GaryJ)`
	`160`	`+Built by [Brady Vercher](https://twitter.com/bradyvercher) & [Gary Jones](https://twitter.com/GaryJ)`