X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile;h=86ebb77d495fab15f39cd6db7c7ca567b37bdd4a;hb=007617c27763d9407ca64bc39be52c7a29c63ea2;hp=82cf254679a7f5bc483069686f123bdb2a6d3a63;hpb=1db9063acc50726bd54f3530084b31c44a8402f0;p=mkws-moved-to-github.git diff --git a/src/Makefile b/src/Makefile index 82cf254..86ebb77 100644 --- a/src/Makefile +++ b/src/Makefile @@ -46,6 +46,7 @@ mkws-js mkws-complete.js: Makefile mkws.js mkws-jquery.js ${HANDLEBARS_FILE} ${J echo "*/"; \ cat ${JQUERY_FILE}; \ cat ${JQUERY_JSON_FILE}; \ + echo 'mkws_jQuery = $.noConflict();'; \ cat ${HANDLEBARS_FILE}; \ cat ${PP2_FILE}; \ cat mkws.js; \