dashboard: fix merge

514bb4c6 · Kálmán Viktor · f511b5cc · 514bb4c6
Commit 514bb4c6 authored Jul 10, 2014 by Kálmán Viktor
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

circle/dashboard/static/dashboard/dashboard.css
+0 -1

No files found.
--- a/circle/dashboard/static/dashboard/dashboard.css
+++ b/circle/dashboard/static/dashboard/dashboard.css
@@ -723,7 +723,6 @@ textarea[name="list-new-namelist"] {
 }
-<<<<<<< HEAD
 #store-list-list {
  list-style: none;
 }