Fixed merge error.

app/client/app.css

@@ -1318,11 +1318,8 @@ nav form input[type="image"]{
     height: 28px;
     font-size: 28px !important;
 }
-<<<<<<< HEAD
-=======
 
 .settings-label {
     color: #50a3a2;
     line-height: 18px;
 }
->>>>>>> origin/master