From 3cc53c41d3992e8e16770bc96580d583f2199b23 Mon Sep 17 00:00:00 2001
From: William Bartholomew <wdb@willbar.com>
Date: Fri, 12 Feb 2016 09:30:09 -0800
Subject: [PATCH] Removed trailing merge conflict marker

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7d4b7c8..1d15880 100644
--- 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!
\ No newline at end of file