Skip to content
Browse files

Fixed merge conflicts in nonzero theme

  • Loading branch information...
2 parents 66c6e87 + 2150d15 commit 2012d82a96df0384ed29c8fde334b6a5b3fd1afd Sam Hemelryk committed Mar 14, 2011
Showing with 2 additions and 0 deletions.
  1. +2 −0 theme/nonzero/style/core.css
View
2 theme/nonzero/style/core.css
@@ -247,3 +247,5 @@ a:active {
box-shadow: 0px 1px 3px #ccc;
}
+/** Custom CSS **/
+[[setting:customcss]]

0 comments on commit 2012d82

Please sign in to comment.
Something went wrong with that request. Please try again.