fix(ras-acc): clean up merge conflict marker

Automattic · Jul 3, 2024 · 0517f35 · 0517f35
1 parent cce9f15
commit 0517f35
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/newspack-katharine/sass/theme-description.scss b/newspack-katharine/sass/theme-description.scss
@@ -5,11 +5,7 @@ Author: Automattic
 Author URI: https://newspack.com
 Description:
 Requires at least: WordPress 4.9.6
-<<<<<<< HEAD
-Version: 1.89.0-epic-ras-acc.2
-=======
 Version: 1.90.3
->>>>>>> trunk
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: newspack-theme