admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bad merge

Browse Source
This commit is contained in:
Sheel Choksi
2013-11-11 21:01:36 -08:00
parent 614a18453e
commit 7ee5073921
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/core/SpecSpec.js
View File

@@ -230,7 +230,7 @@ describe("Spec", function() {
setTimeout: function (fn) { return setTimeout(fn, 0); }, setTimeout: function (fn) { return setTimeout(fn, 0); },
clearTimeout: clearTimeout clearTimeout: clearTimeout
}, },
queueRunner: function (attrs) { queueRunnerFactory: function (attrs) {
// Fake the "run" method of a regular queue runner // Fake the "run" method of a regular queue runner
// for an async spec. // for an async spec.
try { try {