Spiel: fix style.css file merge conflict

Automattic · Dec 13, 2023 · ce68fd6 · ce68fd6
1 parent 21facb8
commit ce68fd6
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/spiel/style.css b/spiel/style.css
@@ -7,11 +7,7 @@ Description: Spiel is a game magazine theme.
 Requires at least: 6.0
 Tested up to: 6.4
 Requires PHP: 5.7
-<<<<<<< HEAD
 Version: 1.0.2
-=======
-Version: 1.0.1
->>>>>>> parent of 2f6edbda3 (Remove undeployed version of Spiel)
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: spiel