Rumperuu/footnotes
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix: clear up merge conflict

Browse source
This commit is contained in:
Ben Goldsworthy 2021-04-26 17:16:36 +01:00
parent c8950e6d1a
commit c81e923670
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/includes/class-footnotes.php
View file

@ -258,11 +258,7 @@ class Footnotes {
*/ */
wp_enqueue_script( wp_enqueue_script(
'mci-footnotes-jquery-tools', 'mci-footnotes-jquery-tools',
<<<<<<< HEAD:src/includes/class-footnotes.php plugins_url( 'footnotes/public/js/jquery.tools' . ( ( PRODUCTION_ENV ) ? '.min' : '' ) . '.js' ),
plugins_url( 'footnotes/public/js/jquery.tools.min.js' ),
=======
plugins_url( 'footnotes/js/jquery.tools' . ( ( PRODUCTION_ENV ) ? '.min' : '' ) . '.js' ),
>>>>>>> linting:src/class/init.php
array(), array(),
'1.2.7.redacted.2', '1.2.7.redacted.2',
false false