Nothing changed, ignore this commit

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

 <!--
   Copyright 2017 The LUCI Authors. All rights reserved.
   Use of this source code is governed under the Apache License, Version 2.0
   that can be found in the LICENSE file.
 -->
 
 <link rel="import" href="config-file-card.html">
 <link rel="import" href="../../bower_components/iron-ajax/iron-ajax.html">
 <link rel="import" href="../../bower_components/iron-icons/iron-icons.html">
 <link rel="import" href="../../bower_components/paper-item/paper-item.html">
 <link rel="import" href="../../bower_components/paper-spinner/paper-spinner.html">
 <link rel="import" href="../../bower_components/polymer/polymer.html">
 <link rel="import" href="../../bower_components/iron-icons/maps-icons.html">
 <link rel="import" href="../../bower_components/paper-tooltip/paper-tooltip.html">
 
 <dom-module id="config-set">
   <template>
     <style>
-      .spinner {
-        text-align: center;
+      @media only screen and (min-width: 768px) {
+        .center {
+          width: 550px;
+        }
       }
 
       .category {
         font-size: 100%;
         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%;
         animation: fadein 1.5s;
       }
 
       @keyframes fadein {
         from {opacity: 0}
         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
         auto
         id="requestConfigs"
         url="/_ah/api/config/v1/config-sets?config_set=[[category]]/[[name]][[route.path]]&include_files=true&include_last_import_attempt=true"
         handle-as="json"
         on-response="_onGotConfigFiles"
         headers="[[auth_headers]]">
     </iron-ajax>
@@ skipping 174 matching lines @@
       },
 
       _onRefreshError: function() {
         this.isRefreshing = false;
         this.refreshMessage = "Error: Files could not be refreshed.";
         this.fire('refreshError');
       }
     });
   </script>
 </dom-module>