Fixed Errors

2018-11-01 20:01:43 +01:00 · 2018-11-01 20:01:43 +01:00 · 8b6f55b7ae
parent d6a7023b51
commit 8b6f55b7ae
1 changed files with 0 additions and 1 deletions
--- a/init.lua
+++ b/init.lua
@ -4,7 +4,6 @@ local remdir = minetest.get_modpath(modname)
 local fast = "fast.lua"
 local slow = "slow.lua"

-<<<<<<< HEAD
 local remover = {}

 remover.green = '#00FF00'