remove remnant git merge annotation

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 4828fda7dc27719a63f575b1dca354c88bc1fa5d..26e9b8b067b6eb0f03e84579edbeeb86b58edcd2 100755 (executable)
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -12,7 +12,6 @@ bindkey '^H' backward-delete-word
 # Ctrl+Del deletes succeeding word
 bindkey '^[[3^' delete-word
 
-<<<<<<< HEAD
 # Ctrl+left arrow moves cursor one word left
 bindkey '^[Od' backward-word