fix conflicts

This commit is contained in:
Marion Muszynski 2017-01-24 12:35:45 +01:00
commit 1c36dc6731
2 changed files with 0 additions and 10 deletions

View File

@ -7200,11 +7200,6 @@ table#carrierTable tbody td {
width: 700px; width: 700px;
} }
/* Order Carrier (socol) */
#super-selector {
display: none!important;
}
/* Mondial Relay */ /* Mondial Relay */
#relay_point_selected_box{ #relay_point_selected_box{
border: 1px solid #BDC2C9; border: 1px solid #BDC2C9;

View File

@ -5117,8 +5117,3 @@ h3.gift_title {
font-size: 13px; font-size: 13px;
} }
/* Order Carrier (socol) */
#super-selector {
display: none!important;
}