From c81e9236703893493950411ec3d5e78f3b957513 Mon Sep 17 00:00:00 2001 From: Rumperuu Date: Mon, 26 Apr 2021 17:16:36 +0100 Subject: [PATCH] fix: clear up merge conflict --- src/includes/class-footnotes.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/includes/class-footnotes.php b/src/includes/class-footnotes.php index 89a06fb..f442673 100644 --- a/src/includes/class-footnotes.php +++ b/src/includes/class-footnotes.php @@ -258,11 +258,7 @@ class Footnotes { */ 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