From 9a9e266ae00ffee1ae18fd2c878bce09356fe3fb Mon Sep 17 00:00:00 2001
From: Atlas Cove <Atlas48@gmx.com>
Date: Wed, 6 Dec 2023 12:42:53 +0000
Subject: [PATCH] cleaning up accidentally committed merge debris

---
 render.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/render.sh b/render.sh
index 4cb7778..b02c077 100755
--- a/render.sh
+++ b/render.sh
@@ -113,11 +113,7 @@ case $1 in
 	dir) dirs;;
 	doc) docs;;
 	docs) docs;;
-<<<<<<< HEAD
 	s[ac]ss) sassfn;;
-=======
-	s[ac]ss) sass;;
->>>>>>> ee-dev
 	other) dirs; other;;
 	rest) other;;
 	info) info;;