categories styles updated for block pattern

spearhead/style-rtl.css

@@ -371,7 +371,24 @@ Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-me
 	text-transform: uppercase;
 }
 
-<<<<<<< HEAD
+.wp-block-categories ul {
+	list-style-type: none;
+	padding: 0;
+}
+
+.wp-block-categories .cat-item {
+	padding: 5px 0;
+}
+
+.wp-block-categories a {
+	font-size: var(--heading--font-size-h3);
+	color: var(--entry-header--color);
+}
+
+.wp-block-categories a:hover {
+	color: var(--global--color-primary);
+}
+
 .screen-reader-text, .search-form input[type="submit"] {
 	/* Text meant only for screen readers. */
 	border: 0;
@@ -413,9 +430,6 @@ Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-me
 	outline: 0;
 }
 
-=======
-<<<<<<< HEAD
->>>>>>> added categories to block pattern
 .search-results .site-main > * {
 	padding: var(--global--spacing-vertical) 0;
 }
@@ -479,22 +493,4 @@ Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-me
 	margin-top: calc( var(--global--spacing-vertical) / 2);
 	padding-top: 0;
 	border: none;
-=======
-.wp-block-categories ul {
-	list-style-type: none;
-	padding: 0;
-}
-
-.wp-block-categories .cat-item {
-	padding: 5px 0;
-}
-
-.wp-block-categories a {
-	font-size: var(--heading--font-size-h3);
-	color: var(--entry-header--color);
-}
-
-.wp-block-categories a:hover {
-	color: var(--global--color-primary);
->>>>>>> added categories to block pattern
 }