Update README.md

tsabend · Feb 24, 2015 · 0f55de3 · 0f55de3
1 parent 288ad31
commit 0f55de3
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,12 +1,7 @@
-<<<<<<< HEAD
-# Set_server
-
-Doc, are you telling me that you built a time machine out of a delorean.
-=======
+===
 set
 ===
 
 http://en.wikipedia.org/wiki/Set_(game)
-
 This is a version of the game Set made using JavaScript and jQuery.
->>>>>>> 06f9a60e75fb5f29dfb46ce7748d345424a6ac5b
+