From cb9620d7917cc7fa4aeee54b21d32593a50b081c Mon Sep 17 00:00:00 2001
From: Patrick Davison <snapwilliam@gmail.com>
Date: Tue, 15 Jan 2013 01:21:52 -0800
Subject: The scary chat-app in working form!

---
 css/challenge.css | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'css')

diff --git a/css/challenge.css b/css/challenge.css
index a7f7465..15a94ab 100644
--- a/css/challenge.css
+++ b/css/challenge.css
@@ -40,7 +40,6 @@
 	display: none;
 }
 
-<<<<<<< HEAD
 .challengelist_map {
 	float:left;
 	padding: 15px;
@@ -56,8 +55,6 @@
 	border-width: 0px 0px 1px 1px;
 }
 
-=======
->>>>>>> origin/HEAD
 /** Challenge listing page **/
 #challengelist_wrapper #challengelist {}
 #challengelist_wrapper #challengelist .challengelist_tier {
-- 
cgit v1.2.3