diff options
author | Valerio Virgillito | 2012-02-16 22:08:04 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-16 22:08:04 -0800 |
commit | 0175cb67e426a27a3ecfb7b81317caa383c8a5a5 (patch) | |
tree | b4fbfcaabaadff508ad5463e8f71fd643995aacb /node_modules/montage/montage.js | |
parent | fe71cb9aa1700199c0089166ad54fc56eb760644 (diff) | |
parent | 9f0c4efe2ed9a00f2c5d85c9d88a8040fedb5d8f (diff) | |
download | ninja-0175cb67e426a27a3ecfb7b81317caa383c8a5a5.tar.gz |
Merge branch 'refs/heads/master' into components
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) { |