Nothing changed, ignore this commit

appengine/config_service/ui/src/config-ui/config-set.html

Index: appengine/config_service/ui/src/config-ui/config-set.html
diff --git a/appengine/config_service/ui/src/config-ui/config-set.html b/appengine/config_service/ui/src/config-ui/config-set.html
index ab1dd4c2126a09878b02c5340009c5ffdc7b40ed..ff44001446ca0c5d2e99e1ccd9462e18e9c5876d 100644
--- a/appengine/config_service/ui/src/config-ui/config-set.html
+++ b/appengine/config_service/ui/src/config-ui/config-set.html
@@ -16,8 +16,10 @@
 <dom-module id="config-set">
   <template>
     <style>
-      .spinner {
-        text-align: center;
+      @media only screen and (min-width: 768px) {
+        .center {
+          width: 550px;
+        }
       }
 
       .category {
@@ -25,11 +27,16 @@
         font-family: sans-serif;
       }
 
+      .name {
+        font-size: 200%;
+        font-family: sans-serif;
+        word-wrap: break-word;
+      }
+
       .center {
-        width: 20%;
         margin: auto;
         text-align: left;
-      }
+      }    
 
       .config-card { 
         padding-bottom: 1%;
@@ -41,25 +48,26 @@
         to {opacity: 1}
       }
 
-      .name {
-        font-size: 200%;
-        font-family: sans-serif;
-        word-wrap: break-word;
-      }
-
-      #refreshStatus { font-size: 80%; }
-
       .title {
         padding-bottom: 1%;
         padding-top: 5%;
       }
 
+      #refreshStatus { font-size: 80%; }
+
       .paper-green { color: var(--paper-green-600); }
 
       .paper-red { color: var(--paper-red-600); }
 
       .paper-grey { color: var(--paper-grey-600); }
 
+<<<<<<< ours
+=======
+      .spinner {
+        text-align: center;
+      }
+
+>>>>>>> theirs
     </style>
 
     <iron-ajax