From 7025e6109aeee96cd1af6ad51ffc68bd06f2ffd1 Mon Sep 17 00:00:00 2001 From: Robert Felty Date: Tue, 5 Nov 2024 12:34:12 +0100 Subject: [PATCH] fixed rebase bug --- projects/plugins/search/jetpack-search.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/projects/plugins/search/jetpack-search.php b/projects/plugins/search/jetpack-search.php index e8223c40b3ff7..53b82104dd200 100644 --- 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.' );