diff options
| author | Ananya Sen | 2012-02-17 14:26:56 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-17 14:26:56 -0800 |
| commit | 2980816130a44cd478b2a9d6606e021efbcebd4a (patch) | |
| tree | 762d98ba8852b858c03760f4b9bef294fae6486c /node_modules/montage/montage.js | |
| parent | 96178309ddcdb54c0c451b69ea6fb8cdf76fcf62 (diff) | |
| parent | a42c536c2b3209afc058eabd31167bd0aa6f71c8 (diff) | |
| download | ninja-2980816130a44cd478b2a9d6606e021efbcebd4a.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
css/ninja.css
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'node_modules/montage/montage.js')
| -rwxr-xr-x | node_modules/montage/montage.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/montage.js b/node_modules/montage/montage.js index cee1f27a..495b6c72 100755 --- a/node_modules/montage/montage.js +++ b/node_modules/montage/montage.js | |||
| @@ -78,7 +78,7 @@ if (typeof window !== "undefined") { | |||
| 78 | Require.PackageSandbox(params.montageBase, config) | 78 | Require.PackageSandbox(params.montageBase, config) |
| 79 | .then(function (montageRequire) { | 79 | .then(function (montageRequire) { |
| 80 | montageRequire.inject("core/promise", Promise); | 80 | montageRequire.inject("core/promise", Promise); |
| 81 | montageRequire.inject("core/shim/timeers", {}); | 81 | montageRequire.inject("core/shim/timers", {}); |
| 82 | 82 | ||
| 83 | // install the linter, which loads on the first error | 83 | // install the linter, which loads on the first error |
| 84 | config.lint = function (module) { | 84 | config.lint = function (module) { |