Removed trailing merge conflict marker

2016-02-12 09:30:09 -08:00 · 2016-02-12 09:30:09 -08:00 · 3cc53c41d3
--- a/README.md
+++ b/README.md
@ -49,5 +49,4 @@ The env.json must have the following structure:
 ```

 # Contributing
-Pull requests that honor the traits above will gladly be considered!
->>>>>>> Initial version
+Pull requests that honor the traits above will gladly be considered!