From c3c3ade0e80995ded7de8bb3bb901373948017d5 Mon Sep 17 00:00:00 2001
From: jedrzejchalubek <jedrzej.chalubek@gmail.com>
Date: Tue, 20 Aug 2019 12:14:13 +0200
Subject: [PATCH] fix(): Remove conflict from plugin header comment

---
 tonik-gin.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tonik-gin.php b/tonik-gin.php
index a97cbec..685f1c1 100644
--- 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+