From ca5b3689894013365f617cb5513372e6031e8ae7 Mon Sep 17 00:00:00 2001 From: salaaad2 Date: Wed, 11 Mar 2020 20:42:12 +0100 Subject: gang_gang --- map/map_one.cub | 6 ------ 1 file changed, 6 deletions(-) (limited to 'map/map_one.cub') diff --git a/map/map_one.cub b/map/map_one.cub index b0eedb0..29315e3 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -13,16 +13,10 @@ T ./media/img/spikes.xpm SH 4 111111111111111111 -<<<<<<< HEAD 100000000002000001 100000030002000001 100100000004000201 -1011000N0111000001 -======= -120000000011000001 -100100000000000201 101100000111000001 ->>>>>>> master 111111111111110011 1000001 100001 1001001 100001 -- cgit v1.2.3