From b58907aa2e8a1e4fde8b45c48089515442c01f78 Mon Sep 17 00:00:00 2001
From: Tiehuis <mti@protonmail.ch>
Date: Sun, 22 Feb 2015 18:19:42 +1300
Subject: [PATCH] Remove lines not removed in README during merge

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

diff --git a/README.md b/README.md
index 8dd7069..b1a1b3c 100644
--- 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.