Andrew's git / dotfiles.git / diff
?
fix merge remnant
authorAndrew Lorimer <andrew@lorimer.id.au>
Sun, 27 Feb 2022 02:01:49 +0000 (13:01 +1100)
committerAndrew Lorimer <andrew@lorimer.id.au>
Sun, 27 Feb 2022 02:01:49 +0000 (13:01 +1100)
zsh/.zshrc patch | blob | history
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 7f7c09c1aa4892adbf3e6ac9cc7b2a8c376efee3..d39fec7f909b76f49728133320cffb6c3519cc4c 100755 (executable)
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -46,7 +46,6 @@ plugins=(git)
 
 source $ZSH/oh-my-zsh.sh
 
-<<<<<<< HEAD
 # ---
 # Aliases
 # ---