From 912ea5de0a52df31d4225aa4096b35685a018b80 Mon Sep 17 00:00:00 2001
From: Victor Häggqvist <victor@snilius.com>
Date: Thu, 12 Jun 2014 00:22:41 +0200
Subject: me stupid

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index bd3dd95..4c03ee3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-
 # Ignore build generated files
 build
 =======
@@ -23,4 +21,3 @@ build
 *.app
 
 *.png
->>>>>>> edd9e6670a145e3f41f34c4c6c1cfee44f61a2c7
-- 
cgit v1.2.3