fix d6764eed20 (bad merge ?)

2013-08-30 17:39:04 +02:00 · 2013-08-30 17:39:04 +02:00 · b53a56f473
parent 6446792fe6
commit b53a56f473
1 changed files with 0 additions and 1 deletions
--- 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;
 }