Add mobile but remove news in it

app/views/layouts/mobile.mobile.erb

@@ -11,7 +11,11 @@
   <meta name="description" content="">
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black">
+<<<<<<< HEAD
   <meta name="viewport" content="user-scalable=no, initial-scale=1.0, maximum-scale=1.0">
+=======
+  <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0">
+>>>>>>> Add mobile but remove news in it
   <!-- iPhone -->
   <link href="<%= asset_path 'mobile/apple-startup-iPhone.png' %>" media="(device-width: 320px) and (device-height: 480px) and (-webkit-device-pixel-ratio: 1)" rel="apple-touch-startup-image">