fix: clear up merge conflict

markcheret · Apr 26, 2021 · c81e923 · c81e923
1 parent c8950e6
commit c81e923
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/includes/class-footnotes.php b/src/includes/class-footnotes.php
@@ -258,11 +258,7 @@ public function register_public() {
 				 */
 				wp_enqueue_script(
 					'mci-footnotes-jquery-tools',
-<<<<<<< HEAD:src/includes/class-footnotes.php
-					plugins_url( 'footnotes/public/js/jquery.tools.min.js' ),
-=======
-					plugins_url( 'footnotes/js/jquery.tools' . ( ( PRODUCTION_ENV ) ? '.min' : '' ) . '.js' ),
->>>>>>> linting:src/class/init.php
+					plugins_url( 'footnotes/public/js/jquery.tools' . ( ( PRODUCTION_ENV ) ? '.min' : '' ) . '.js' ),
 					array(),
 					'1.2.7.redacted.2',
 					false