From b7838c51dd5ba07b600f6a50864aa49ca45212d7 Mon Sep 17 00:00:00 2001
From: larstvei <larstvei@student.matnat.uio.no>
Date: Sun, 15 Dec 2013 22:56:42 +0100
Subject: [PATCH] Merge conflict...

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

diff --git a/README.md b/README.md
index 20716c4..d531aed 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,9 @@ etype
 =====
 
 A typing game for Emacs.
-<<<<<<< HEAD
 
 Etype is a game written for Emacs, and is heavily inspired by
 [Z-Type](http://phoboslab.org/ztype/).
 
 ##Not yet playable.
 =======
->>>>>>> 1eaa79794e403f9dcbf289f403465e362e8e749c