From 82d3b5422fa972ff2eb6047e5a574d48b5017b93 Mon Sep 17 00:00:00 2001
From: "D. Moonfire" <d.moonfire@moonfire.us>
Date: Mon, 5 Sep 2022 23:03:42 -0500
Subject: [PATCH] fix(template): cleaning up prettier

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

diff --git a/.prettierignore b/.prettierignore
index d8eeeba..f1a0e24 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,16 +1,8 @@
 *~
 flake.*
-<<<<<<< HEAD
-*.cs
-=======
->>>>>>> 16880cb36e748cd195e5ad85c4100e4209cc594c
 
 node_modules/
 .direnv/
 .config/
 obj/
-<<<<<<< HEAD
 bin/
-=======
-bin/
->>>>>>> 16880cb36e748cd195e5ad85c4100e4209cc594c