From 7ee5073921a1249cf20af85d9b264dc7edec71c0 Mon Sep 17 00:00:00 2001
From: Sheel Choksi <sheelchoksi@gmail.com>
Date: Mon, 11 Nov 2013 21:01:36 -0800
Subject: [PATCH] Fix bad merge

---
 spec/core/SpecSpec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/core/SpecSpec.js b/spec/core/SpecSpec.js
index a3515483..6f7378f9 100644
--- a/spec/core/SpecSpec.js
+++ b/spec/core/SpecSpec.js
@@ -230,7 +230,7 @@ describe("Spec", function() {
           setTimeout: function (fn) { return setTimeout(fn, 0); },
           clearTimeout: clearTimeout
         },
-        queueRunner: function (attrs) {
+        queueRunnerFactory: function (attrs) {
           // Fake the "run" method of a regular queue runner
           // for an async spec.
           try {