Merge branch 'master' of https://github.com/acmgit/minetest_remover

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

+<<<<<<< HEAD
 local remover = {}

 remover.green = '#00FF00'