1
0
mirror of https://github.com/Refactorio/RedMew.git synced 2025-03-03 14:53:01 +02:00

removed lines

This commit is contained in:
James Gillham 2017-08-25 06:51:26 +01:00
commit 608850eda6

View File

@ -10,13 +10,10 @@ in this file and your run_*type*_module(event) function will be called.
--require "locale.gen_combined.island_resort"
--grilledham's maps
<<<<<<< HEAD
=======
--MAP_GEN = require "locale.gen_combined.grilledham_map_gen.presets.test"
MAP_GEN = require "locale.gen_combined.grilledham_map_gen.presets.mobius_strip"
--MAP_GEN = require "locale.gen_combined.grilledham_map_gen.presets.antfarm"
--MAP_GEN = require "locale.gen_combined.grilledham_map_gen.presets.picture_test"
>>>>>>> new stuff
--MAP_GEN = require "locale.gen_combined.grilledham_map_gen.presets.creation_of_adam"
--shapes--