Fixed merge conflicts in nonzero theme

2011-03-14 10:59:58 +08:00
parent 66c6e870ef 2150d1580f
commit 2012d82a96
1 changed files with 2 additions and 0 deletions
@@ -247,3 +247,5 @@ a:active {
    box-shadow: 0px 1px 3px #ccc;
 }

+/** Custom CSS **/
+[[setting:customcss]]