diff options
author | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
---|---|---|
committer | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
commit | 10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e (patch) | |
tree | 12b31910a3c7c7fa2ee0b26d8aaa611710e139a5 /node_modules/montage/core/url.js | |
parent | 7f8730c3add146f1ba107e6fc22d1f5a8348ed8b (diff) | |
parent | 668510892537eaaeb2e11520831d87b44b2489b7 (diff) | |
download | ninja-10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into text-tool
Conflicts:
_scss/compass_app_log.txt
css/ninja.css
Diffstat (limited to 'node_modules/montage/core/url.js')
-rw-r--r-- | node_modules/montage/core/url.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/core/url.js b/node_modules/montage/core/url.js index 3f529e35..24e55934 100644 --- a/node_modules/montage/core/url.js +++ b/node_modules/montage/core/url.js | |||
@@ -11,7 +11,7 @@ | |||
11 | if (typeof bootstrap !== "undefined") { | 11 | if (typeof bootstrap !== "undefined") { |
12 | bootstrap("core/url", definition); | 12 | bootstrap("core/url", definition); |
13 | } else { | 13 | } else { |
14 | bootstrap(require, exports); | 14 | definition(require, exports); |
15 | } | 15 | } |
16 | })(function (require, exports) { | 16 | })(function (require, exports) { |
17 | 17 | ||