[gnome-software/wip/aday/text-styles] updates

[Allan Day <allanday src gnome org>]

commit a398dfba8ca82f0550881e038bf7b1f52ffc0752
Author: Allan Day <allanpday gmail com>
Date:   Wed May 29 14:13:30 2019 +0100

    updates

 src/gs-category-page.ui  |  4 ----
 src/gs-overview-page.ui  | 12 ------------
 src/gs-upgrade-banner.ui |  2 +-
 3 files changed, 1 insertion(+), 17 deletions(-)
---
diff --git a/src/gs-category-page.ui b/src/gs-category-page.ui
index e81436e9..09fa04df 100644
--- a/src/gs-category-page.ui
+++ b/src/gs-category-page.ui
@@ -85,11 +85,7 @@
                                   <relation target="featured_grid" type="label-for"/>
                                 </accessibility>
                                 <style>
-<<<<<<< HEAD
                                   <class name="type-title-1"/>
-=======
-                                  <class name="type-title"/>
->>>>>>> 5735182817b811894ff6f51472eb62d15c5cd824
                                 </style>
                               </object>
                             </child>
diff --git a/src/gs-overview-page.ui b/src/gs-overview-page.ui
index 8660102a..d3fb2ee8 100644
--- a/src/gs-overview-page.ui
+++ b/src/gs-overview-page.ui
@@ -120,11 +120,7 @@
                               <relation target="flowbox_categories" type="label-for"/>
                             </accessibility>
                             <style>
-<<<<<<< HEAD
                               <class name="type-title-1"/>
-=======
-                              <class name="type-title"/>
->>>>>>> 5735182817b811894ff6f51472eb62d15c5cd824
                             </style>
                           </object>
                         </child>
@@ -240,11 +236,7 @@
                               <relation target="box_popular" type="label-for"/>
                             </accessibility>
                             <style>
-<<<<<<< HEAD
                               <class name="type-title-1"/>
-=======
-                              <class name="type-title"/>
->>>>>>> 5735182817b811894ff6f51472eb62d15c5cd824
                             </style>
                           </object>
                         </child>
@@ -270,11 +262,7 @@
                               <relation target="box_recent" type="label-for"/>
                             </accessibility>
                             <style>
-<<<<<<< HEAD
                               <class name="type-title-1"/>
-=======
-                              <class name="type-title"/>
->>>>>>> 5735182817b811894ff6f51472eb62d15c5cd824
                             </style>
                           </object>
                         </child>
diff --git a/src/gs-upgrade-banner.ui b/src/gs-upgrade-banner.ui
index 4ceaae14..5cf408b3 100644
--- a/src/gs-upgrade-banner.ui
+++ b/src/gs-upgrade-banner.ui
@@ -29,7 +29,7 @@
             <property name="visible">True</property>
             <property name="label" translatable="yes">A major upgrade, with new features and added 
polish.</property>
             <style>
-              <class name="type-title-1"/>
+              <class name="type-title-2"/>
             </style>
           </object>
         </child>