diff options
Diffstat (limited to 'map/map_one.cub')
| -rw-r--r-- | map/map_one.cub | 6 |
1 files changed, 0 insertions, 6 deletions
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 |