From 0904978292d33b471371669b7284ce41221a8ad6 Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 7 Jun 2013 13:02:47 +0800 Subject: [PATCH] Remove non resolved conflict --- app/assets/stylesheets/questionnaire.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/assets/stylesheets/questionnaire.css b/app/assets/stylesheets/questionnaire.css index db74f00a..d191b1b0 100644 --- 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; }