Skip to content

Commit

Permalink
fix(ras-acc): clean up merge conflict marker (#2335)
Browse files Browse the repository at this point in the history
Left some merge conflict markup while merging trunk πŸ™‡

This PR cleans it up!
  • Loading branch information
chickenn00dle authored Jul 8, 2024
1 parent f325e8f commit 080e0fc
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions newspack-katharine/sass/theme-description.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 080e0fc

Please sign in to comment.