diff options
Diffstat (limited to 'css')
| -rw-r--r-- | css/challenge.css | 3 |
1 files changed, 0 insertions, 3 deletions
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 { |