Fix merge conflict

lkcampbell · lkcampbell · commit 427c8e999d81 · 2014-04-17T23:30:51.000-07:00
diff --git a/test/spec/FileFilters-test.js b/test/spec/FileFilters-test.js
@@ -463,7 +463,7 @@ define(function (require, exports, module) {
                     }, "search bar close");
                 });
                 runs(function () {
-                    waitsForDone(CommandManager.execute(Commands.CMD_FIND_IN_FILES));
+                    FindInFiles._doFindInFiles(scope);
                 });
             }
 

Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,7 @@ define(function (require, exports, module) {`
`463`	`463`	`}, "search bar close");`
`464`	`464`	`});`
`465`	`465`	`runs(function () {`
`466`		`- waitsForDone(CommandManager.execute(Commands.CMD_FIND_IN_FILES));`
	`466`	`+ FindInFiles._doFindInFiles(scope);`
`467`	`467`	`});`
`468`	`468`	`}`
`469`	`469`