Remove non resolved conflict

2013-06-07 13:02:47 +08:00 · 2013-06-07 13:02:47 +08:00 · 0904978292
parent ddd9a9668e
commit 0904978292
1 changed files with 0 additions and 3 deletions
--- a/app/assets/stylesheets/questionnaire.css
+++ b/app/assets/stylesheets/questionnaire.css
@ -127,12 +127,9 @@
 .o-question-group.view-grid tbody .odd .o-question-title, .o-question-group.view-grid tbody .odd td {
  background-color: #f6f6f6;
 }
-<<<<<<< HEAD
-=======
 .o-question-group.view-grid .o-question-title {
  font-size: 1em;
 }
->>>>>>> 19effe9... survey module: update css
 .o-question-group.view-grid tbody .odd .o-question-title {
  background-color: transparent;
 }