fixed conflict

1 files changed, 40 insertions, 0 deletions

diff --git a/node_modules/jquery/src/jquery.js b/node_modules/jquery/src/jquery.js
new file mode 100644
index 0000000..744a98e
--- /dev/null
+++ b/node_modules/jquery/src/jquery.js
@@ -0,0 +1,40 @@
+define( [
+	"./core",
+	"./selector",
+	"./traversing",
+	"./callbacks",
+	"./deferred",
+	"./deferred/exceptionHook",
+	"./core/ready",
+	"./data",
+	"./queue",
+	"./queue/delay",
+	"./attributes",
+	"./event",
+	"./event/alias",
+	"./event/focusin",
+	"./manipulation",
+	"./manipulation/_evalUrl",
+	"./wrap",
+	"./css",
+	"./css/hiddenVisibleSelectors",
+	"./serialize",
+	"./ajax",
+	"./ajax/xhr",
+	"./ajax/script",
+	"./ajax/jsonp",
+	"./ajax/load",
+	"./event/ajax",
+	"./effects",
+	"./effects/animatedSelector",
+	"./offset",
+	"./dimensions",
+	"./deprecated",
+	"./exports/amd"
+], function( jQuery ) {
+
+"use strict";
+
+return ( window.jQuery = window.$ = jQuery );
+
+} );