diff options
| author | Patrick Davison <snapwilliam@gmail.com> | 2013-01-15 01:21:52 -0800 |
|---|---|---|
| committer | Patrick Davison <snapwilliam@gmail.com> | 2013-01-15 01:21:52 -0800 |
| commit | cb9620d7917cc7fa4aeee54b21d32593a50b081c (patch) | |
| tree | 4ec55535f6c44b777da9b4fd5cc48016e7df39a3 /css/challenge.css | |
| parent | 59fc439d341900d99c00a31ff1653b274ba2a037 (diff) | |
| download | pathery-cb9620d7917cc7fa4aeee54b21d32593a50b081c.tar.xz | |
The scary chat-app in working form!
Diffstat (limited to 'css/challenge.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 { |