Skip to content
This repository has been archived by the owner on Nov 14, 2024. It is now read-only.

Commit

Permalink
fix(): Remove conflict from plugin header comment
Browse files Browse the repository at this point in the history
  • Loading branch information
@jedrzejchalubek
jedrzejchalubek committed Aug 20, 2019
1 parent 303d4fd commit c3c3ade
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions tonik-gin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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+
Expand Down

0 comments on commit c3c3ade

Please sign in to comment.