REDMINE_ISSUE-12869

src/App.vue

@@ -130,9 +130,6 @@ export default {
   display: flex;
 }
 
-<<<<<<< HEAD
-@media screen and (min-width: 560px) {
-=======
 /* keep above loader */
 #menu-dropdown {
   z-index: 1001;
@@ -144,8 +141,7 @@ export default {
   }
 }
 
-@media screen and (min-width: 590px) {
->>>>>>> develop
+@media screen and (min-width: 560px) {
   .mobile {
     display: none !important;
   }