fixed rebase bug

Automattic · Nov 5, 2024 · 7025e61 · 7025e61
1 parent 3a3d75e
commit 7025e61
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/projects/plugins/search/jetpack-search.php b/projects/plugins/search/jetpack-search.php
@@ -26,12 +26,7 @@
 define( 'JETPACK_SEARCH_PLUGIN__FILE', __FILE__ );
 define( 'JETPACK_SEARCH_PLUGIN__FILE_RELATIVE_PATH', plugin_basename( __FILE__ ) );
 define( 'JETPACK_SEARCH_PLUGIN__SLUG', 'jetpack-search' );
-<<<<<<< HEAD
 define( 'JETPACK_SEARCH_PLUGIN__VERSION', '3.0.1' );
-=======
-define( 'JETPACK_SEARCH_PLUGIN__VERSION', '2.2.0-alpha' );
->>>>>>> 12e5b707eb (updated version numbers)
-
 defined( 'JETPACK_CLIENT__AUTH_LOCATION' ) || define( 'JETPACK_CLIENT__AUTH_LOCATION', 'header' );
 
 defined( 'JETPACK__API_BASE' ) || define( 'JETPACK__API_BASE', 'https://jetpack.wordpress.com/jetpack.' );