fix(): Remove conflict from plugin header comment

tonik · Aug 20, 2019 · c3c3ade · c3c3ade
1 parent 303d4fd
commit c3c3ade
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/tonik-gin.php b/tonik-gin.php
@@ -4,11 +4,7 @@
 Plugin Name: tonik/gin
 Plugin URI: http://tonik.pl
 Description: Foundation of the Tonik WordPress Starter Theme. Provides all custom functionalities which it offers.
-<<<<<<< HEAD
-Version: 3.0.0
-=======
 Version: 3.1.0
->>>>>>> release-3.1.0
 Author: Tonik
 Author URI: http://tonik.pl
 License: GPL-2.0+