Remove non resolved conflict
This commit is contained in:
parent
ddd9a9668e
commit
0904978292
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue