Permalink
Browse files

rebase master

  • Loading branch information...
2 parents 82a4f05 + a3d20ba commit 3a166ac5b61068bfa1640c87ee20f51a9aa915d6 @vcuculo committed Sep 2, 2011
Showing with 4 additions and 0 deletions.
  1. +4 −0 public/stylesheets/sass/ui.sass
@@ -343,3 +343,7 @@
text-decoration: none
font-weight: bold
color: white
+<<<<<<< HEAD
+=======
+
+>>>>>>> a3d20ba788fa3d1c869b6b6217778584adb35d3e

0 comments on commit 3a166ac

Please sign in to comment.