merge

Author: aragonc

app/Resources/public/css/base.css

@@ -10124,7 +10124,6 @@ ul.dropdown-menu.inner > li > a {
 .summary-course .list-info .text-color{
     color: #0A649F;
 }
-<<<<<<< HEAD
 .question-result h3{
     margin-top: 0;
     margin-bottom: 10px;
@@ -10143,9 +10142,7 @@ ul.dropdown-menu.inner > li > a {
     display: inline-block;
     font-weight: bold;
 }
-=======
 
->>>>>>> 23bad83a744482179b36bc14365ed0c1bef45a2c
 @media (min-width: 768px) {
     .clear-rows-6-4-3 .col-sm-6:nth-child(2n+1) {
         clear: left;