Fix missing part of last merge

arnowelzel · Jan 29, 2024 · 973bf97 · 973bf97
1 parent c45933f
commit 973bf97
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/timed-content.php b/timed-content.php
@@ -14,11 +14,7 @@
 require 'lib/class-customfieldsinterface.php';
 require 'lib/class-timedcontentplugin.php';
 
-<<<<<<< HEAD
-define( 'TIMED_CONTENT_VERSION', '2.78' );
-=======
-define( 'TIMED_CONTENT_VERSION', '2.79' );
->>>>>>> c6fe97ddd336962c5af08a4ec9e4784aa4126b1d
+define( 'TIMED_CONTENT_VERSION', '2.80' );
 define( 'TIMED_CONTENT_SLUG', 'timed-content' );
 define( 'TIMED_CONTENT_PLUGIN_URL', plugins_url() . '/' . TIMED_CONTENT_SLUG );
 define( 'TIMED_CONTENT_SHORTCODE_CLIENT', 'timed-content-client' );