From 31e68e424fd46ad1fe02c8118232091c4274d449 Mon Sep 17 00:00:00 2001
From: Andrew Lorimer <andrew@lorimer.id.au>
Date: Sun, 27 Feb 2022 13:01:49 +1100
Subject: [PATCH] fix merge remnant

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

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