Permalink
Browse files

fixed merge problem

  • Loading branch information...
1 parent 2a39b11 commit 16c242eef2a098a80a6302a5561a28ccd07a8781 @scottmessinger committed Apr 17, 2011
Showing with 0 additions and 3 deletions.
  1. BIN src/.screen.scss.swo
  2. +0 −3 src/screen.scss
View
Binary file not shown.
View
@@ -20,13 +20,10 @@ $accent: #c42817;
.hide{
display: none;
-<<<<<<< HEAD
}
.question{
display: none;
-=======
->>>>>>> ca259d6770762d0fed9cb80f2eb0e1f6df0df8d6
}
.feedback{

0 comments on commit 16c242e

Please sign in to comment.