Fix a merge conflict

ieure · Jul 3, 2015 · 5c8af93 · 5c8af93
1 parent 725105a
commit 5c8af93
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/test-case-mode.el b/test-case-mode.el
@@ -487,12 +487,8 @@ This assumes that no test is still running."
 
         (run-hook-with-args 'test-case-state-change-hook old-state state)))))
 
-<<<<<<< HEAD
 
 ;;; global mode ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-=======
-;;; global mode ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
->>>>>>> upstream-master
 
 (defvar test-case-global-mode-map (make-sparse-keymap)
   "Keymap used by `test-case-global-mode'.")