From e0430bb3732160d6d3cc1ec4ee355d13eb05f71b Mon Sep 17 00:00:00 2001
From: mrmrs <hi@mrmrs.cc>
Date: Wed, 17 Sep 2014 03:22:15 -0700
Subject: [PATCH] Removes git diff stuff :/

---
 sass/_display.scss | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/sass/_display.scss b/sass/_display.scss
index e98d846..1d21c02 100644
--- a/sass/_display.scss
+++ b/sass/_display.scss
@@ -54,11 +54,3 @@
   .dtcol-l {  display: table-column; }
   .dtcolg-l { display: table-column-group; }
 }
-<<<<<<< HEAD
-
-
-
-
-
-=======
->>>>>>> master