From ed39e988f57bb5601b02657083e33524cb0c8ef1 Mon Sep 17 00:00:00 2001
From: "D. Moonfire" <d.moonfire@moonfire.us>
Date: Mon, 5 Sep 2022 22:30:17 -0500
Subject: [PATCH] fix(template): correcting git ignore

---
 .gitignore | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6eba8b7..53987a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,13 +11,6 @@ obj/
 .idea/
 _ReSharper.Caches/
 node_modules/
-<<<<<<< HEAD
-.direnv/
-coverage
-TestResults/
-tests/artifacts/
-.lefthook*
-=======
 
 # NixOS
 .direnv/
@@ -30,4 +23,3 @@ tests/artifacts/
 # Lefthook
 .lefthook-local/
 lefthook-local.yml
->>>>>>> 16880cb36e748cd195e5ad85c4100e4209cc594c