cleaning up accidentally committed merge debris

2023-12-06 12:42:53 +00:00 · 2023-12-06 12:42:53 +00:00 · 9a9e266ae0
parent e0caf6a151
commit 9a9e266ae0
1 changed files with 0 additions and 4 deletions
--- 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;;