diff --git a/spec/app/window-spec.coffee b/spec/app/window-spec.coffee
index 8e1b5af04..354c9e5ef 100644
--- a/spec/app/window-spec.coffee
+++ b/spec/app/window-spec.coffee
@@ -314,4 +314,3 @@ describe "Window", ->
 
         elements.trigger "core:focus-previous"
         expect(elements.find("[tabindex=1]:focus")).toExist()
->>>>>>> master