From 6f846623a8283a4703fd86a5c9a53a2bc9322598 Mon Sep 17 00:00:00 2001 From: Rasmy Nguyen Date: Wed, 3 Jul 2024 13:47:26 -0400 Subject: [PATCH] fix(ras-acc): clean up merge conflict marker --- newspack-katharine/sass/theme-description.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/newspack-katharine/sass/theme-description.scss b/newspack-katharine/sass/theme-description.scss index 9ad4d8c58..e0c98a5ba 100644 --- 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.91.0-epic-ras-acc.1 -======= -Version: 1.90.3 ->>>>>>> trunk License: GNU General Public License v2 or later License URI: LICENSE Template: newspack-theme