From c86827f64a17637684f5273ca5ec1c1a4e6080b9 Mon Sep 17 00:00:00 2001
From: Andrew Lorimer <andrew@charles.cortex>
Date: Fri, 17 May 2019 19:06:24 +1000
Subject: [PATCH] remove erronous merge indicator from zshrc

---
 zsh/.zshrc | 1 -
 1 file changed, 1 deletion(-)

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
 
-- 
2.49.0