From b53a56f473da983c0cd709610a3abf76a34a796f Mon Sep 17 00:00:00 2001
From: Thomas NOEL <tnoel@entrouvert.com>
Date: Fri, 30 Aug 2013 17:39:04 +0200
Subject: [PATCH] fix d6764eed20b6 (bad merge ?)

---
 univcloud/static/css/style.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/univcloud/static/css/style.css b/univcloud/static/css/style.css
index 258722b..b616d68 100644
--- a/univcloud/static/css/style.css
+++ b/univcloud/static/css/style.css
@@ -258,7 +258,6 @@ li.dark-bg:hover .close {
   width: 6em;
 }
 
-<<<<<<< HEAD
 #map-and-idplist {
   height: 700px;
 }