FIX: conflict in settings.py

[myslice.git] / Makefile

diff --git a/Makefile b/Makefile
index 74438a4..235336b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -89,6 +89,12 @@ THIRD-PARTY-RESOURCES += $(shell ls third-party/smartwizard-1636c86/styles/smart
 THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery-notify/jquery.notify.js)
 THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery-notify/jquery.notify.min.js)
 THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery-notify/ui.notify.css)
+# CodeMirror
+THIRD-PARTY-RESOURCES += $(shell ls third-party/codemirror-3.15/lib/codemirror.js) 
+THIRD-PARTY-RESOURCES += $(shell ls third-party/codemirror-3.15/lib/codemirror.css) 
+THIRD-PARTY-RESOURCES += $(shell ls third-party/codemirror-3.15/mode/sql/sql.js)
+# Mustache.js
+THIRD-PARTY-RESOURCES += $(shell ls third-party/mustache/mustache.js)
 
 
 thirdparty-js: