diff options
| author | Eric Guzman | 2012-02-16 14:20:40 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-16 14:20:40 -0800 |
| commit | 6960f62a84b946c92a59e5f5dc537a818f9f62b8 (patch) | |
| tree | 49cbff3fdd8dab11846e5a278406915ec0ec1508 /node_modules/montage/montage.js | |
| parent | 82b1a273219f0ae3d119e156c7acccdbe478f441 (diff) | |
| parent | 81942bd52f0713c9ff5d479ebd12fce577f45e45 (diff) | |
| download | ninja-6960f62a84b946c92a59e5f5dc537a818f9f62b8.tar.gz | |
Merge branch 'refs/heads/master' into PresetsPanel
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) { |