ソースを参照

Spiel: fix style.css file merge conflict

Vicente Canales 1 年間 前
コミット
ce68fd6ca5
1 ファイル変更0 行追加4 行削除
  1. 0 4
      spiel/style.css

+ 0 - 4
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