From 8a0d5068d1b7af709458d2224893a9d25f25feec Mon Sep 17 00:00:00 2001
From: liv <shadows_withal@fastmail.com>
Date: Sat, 18 Nov 2023 15:12:32 +0100
Subject: [PATCH] fix merge conflict remnants

---
 dot_config/fish/config.fish | 1 +
 dot_gitconfig               | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/dot_config/fish/config.fish b/dot_config/fish/config.fish
index c8b7a0a..8158e39 100644
--- a/dot_config/fish/config.fish
+++ b/dot_config/fish/config.fish
@@ -64,6 +64,7 @@ alias editconfig "chezmoi edit ~/.config/fish/config.fish; and chezmoi apply; an
 alias doco "docker-compose"
 alias czm "chezmoi"
 alias zy "sudo zypper"
+alias cvim "chezmoi edit"
 # z is such a weird key to hit frequently, j is much better
 alias j "z"
 # Cargoes and Rust-s
diff --git a/dot_gitconfig b/dot_gitconfig
index eccb066..4a05970 100644
--- a/dot_gitconfig
+++ b/dot_gitconfig
@@ -4,10 +4,7 @@
 	signingkey = 0x6F33B647A7AC80CE
 [core]
 	editor = vim
-<<<<<<< Updated upstream
 	autocrlf = input
-=======
->>>>>>> Stashed changes
 [push]
 	default = simple
 	autoSetupRemote = true