in/ee/intro.md

@@ -34,6 +34,3 @@ A shining beacon of hope and industry with dreams of their own identity.
 
 > Good work, team. That's enough for today. Can't believe we've come so far.
 
-The most inhospitable colonised planet, Saturn's entire population consists mainly of miners and researchers,
-with a notable exception being a single sports stadium.
-

in/ee/slangdict.org

@@ -45,6 +45,3 @@ Martian Spanish is notable for having a neuter case ("-e") for any animate noun.
 - Syane :: (Corrupted from Spanish, Marciano), Martian native.
 * Other
 - Homebound :: n. Someone from Earth.
-- Delve :: n. A generic term for Direct Neural Interface VR, derived from a genericised trademark.
-- Delve :: v. To use a delver
-- Delver :: n. A device that uses the Delve technology.

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;;