no message

css/tour.css

@@ -133,7 +133,15 @@ h2 em { display: none; }
 .fullTourList .listPrice b { font-weight: normal; display: inline-block; float: left; }
 .fullTourList .listPrice em { font-style: normal; color: #a31022; font-size: 16px; margin-left: 10px; display: inline-block; float: left; }
 .fullTourList .listPrice strong { font-weight: normal; color: #a31022; font-size: 28px; display: inline-block; float: left; margin-top: -5px; }
+<<<<<<< .merge_file_a46232
 @media(max-width:768px) {
+=======
+<<<<<<< HEAD
+@media(max-width:768px) {
+=======
+@media(max-width) {
+>>>>>>> a3ab66c8bfe097d8cd9bdd8e19e845bbbf3171e3
+>>>>>>> .merge_file_a46252
 .fullTourList { height:auto !important;}	
 .listInfo { padding:20px; overflow:hidden;}
 .fullTourList img { float: none !important; width:100%; display: block;}