diff options
| author | Nivesh Rajbhandari | 2012-02-20 11:14:44 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-02-20 11:14:44 -0800 |
| commit | abf78e2d7a97d295ce5a1c425fd359d47379137e (patch) | |
| tree | d08c91bd2aef31e6325e0b499b2ffc390018bec6 /node_modules/montage/montage.js | |
| parent | e80a79bff57fecf3aa9b869d8ed2de5fd815287c (diff) | |
| parent | e23708721a71ca4c71365f5f8e8ac7d6113926db (diff) | |
| download | ninja-abf78e2d7a97d295ce5a1c425fd359d47379137e.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into ToolFixes
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) { |