From: Andrew Lorimer <andrew@charles.cortex>
Date: Fri, 17 May 2019 09:06:24 +0000 (+1000)
Subject: remove erronous merge indicator from zshrc
X-Git-Url: https://git.lorimer.id.au/dotfiles.git/diff_plain/c86827f64a17637684f5273ca5ec1c1a4e6080b9

remove erronous merge indicator from zshrc
---

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 66b9b16..e14c1f0 100755
--- 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