Remove lines not removed in README during merge

9 years ago · b58907aa2e
parent 72aa176f19
commit b58907aa2e
1 changed files with 0 additions and 2 deletions
--- a/README.md
+++ b/README.md
@ -1,12 +1,10 @@
 #2048-cli

-<<<<<<< HEAD
 A cli version/engine of the game [2048](https://github.com/gabrielecirulli/2048) for your Linux
 terminal.

 ![Screenshot](http://i.imgur.com/QU7t5mH.png)

-<<<<<<< HEAD
 There currently are 3 versions that can be run. These include a straight-forward terminal
 based, and two using the ncurses and SDL libraries. To add a new graphical version, simply
 create a .c file which implements all the functions in gfx.h and add a Makefile entry.