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

[Allan Day <allanday src gnome org>]

commit db90f4b8fc54d8d7e87906df33322feb7f59b7fa
Merge: 19171541 57351828
Author: Allan Day <allanpday gmail com>
Date:   Wed May 29 12:49:43 2019 +0100

    updates

 src/gs-category-page.ui |  4 ++++
 src/gs-overview-page.ui | 12 ++++++++++++
 2 files changed, 16 insertions(+)
---
diff --cc src/gs-category-page.ui
index 09fa04df,9ad4012d..e81436e9
--- a/src/gs-category-page.ui
+++ b/src/gs-category-page.ui
@@@ -85,7 -85,7 +85,11 @@@
                                    <relation target="featured_grid" type="label-for"/>
                                  </accessibility>
                                  <style>
++<<<<<<< HEAD
 +                                  <class name="type-title-1"/>
++=======
+                                   <class name="type-title"/>
++>>>>>>> 5735182817b811894ff6f51472eb62d15c5cd824
                                  </style>
                                </object>
                              </child>
diff --cc src/gs-overview-page.ui
index d3fb2ee8,15a4a9ea..8660102a
--- a/src/gs-overview-page.ui
+++ b/src/gs-overview-page.ui
@@@ -120,7 -120,7 +120,11 @@@
                                <relation target="flowbox_categories" type="label-for"/>
                              </accessibility>
                              <style>
++<<<<<<< HEAD
 +                              <class name="type-title-1"/>
++=======
+                               <class name="type-title"/>
++>>>>>>> 5735182817b811894ff6f51472eb62d15c5cd824
                              </style>
                            </object>
                          </child>
@@@ -236,7 -236,7 +240,11 @@@
                                <relation target="box_popular" type="label-for"/>
                              </accessibility>
                              <style>
++<<<<<<< HEAD
 +                              <class name="type-title-1"/>
++=======
+                               <class name="type-title"/>
++>>>>>>> 5735182817b811894ff6f51472eb62d15c5cd824
                              </style>
                            </object>
                          </child>
@@@ -262,7 -262,7 +270,11 @@@
                                <relation target="box_recent" type="label-for"/>
                              </accessibility>
                              <style>
++<<<<<<< HEAD
 +                              <class name="type-title-1"/>
++=======
+                               <class name="type-title"/>
++>>>>>>> 5735182817b811894ff6f51472eb62d15c5cd824
                              </style>
                            </object>
                          </child>