remove erronous merge indicator from zshrc

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 66b9b1656485d0eb07de58883562dc42690428b2..e14c1f0287d7a6ed8a712c56f0d63c773a11fe8a 100755 (executable)
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -14,7 +14,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