From: Andrew Lorimer <andrew@lorimer.id.au>
Date: Sun, 27 Feb 2022 02:01:49 +0000 (+1100)
Subject: fix merge remnant
X-Git-Url: https://www.git.lorimer.id.au/dotfiles.git/diff_plain/refs/heads/larry?hp=8bb0202202c57de37bc1675e0771cd87d56938ad

fix merge remnant
---

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 7f7c09c..d39fec7 100755
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -46,7 +46,6 @@ plugins=(git)
 
 source $ZSH/oh-my-zsh.sh
 
-<<<<<<< HEAD
 # ---
 # Aliases
 # ---