tanner/2048-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove lines not removed in README during merge

Browse Source
This commit is contained in:
Tiehuis 2015-02-22 18:19:42 +13:00
parent 72aa176f19
commit b58907aa2e
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,12 +1,10 @@
#2048-cli #2048-cli
<<<<<<< HEAD
A cli version/engine of the game [2048](https://github.com/gabrielecirulli/2048) for your Linux A cli version/engine of the game [2048](https://github.com/gabrielecirulli/2048) for your Linux
terminal. terminal.
![Screenshot](http://i.imgur.com/QU7t5mH.png) ![Screenshot](http://i.imgur.com/QU7t5mH.png)
<<<<<<< HEAD
There currently are 3 versions that can be run. These include a straight-forward terminal 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 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. create a .c file which implements all the functions in gfx.h and add a Makefile entry.