From 82f70885787967bb38969717e9d29a65b85583c8 Mon Sep 17 00:00:00 2001
From: Kristian Sloth Lauszus <lauszus@gmail.com>
Date: Sun, 22 Feb 2015 20:37:42 +0100
Subject: [PATCH] Removed content from merge conflict

---
 .gitattributes | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 169ac94e..6238b035 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Auto detect text files and perform LF normalization
 * text=auto
 * text eol=lf
@@ -22,6 +21,3 @@
 *.PDF	 diff=astextplain
 *.rtf	 diff=astextplain
 *.RTF	 diff=astextplain
-=======
-text eol=lf
->>>>>>> acca3c8fe06a3d95806a8656c8a6ddef081cc210