From b68978ecb3bc798283be7b2b245598b142f86b89 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 22 May 2013 22:30:04 +0800
Subject: [PATCH] :lipstick:

---
 spec/app/window-spec.coffee | 1 -
 1 file changed, 1 deletion(-)

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