diff options
Diffstat (limited to '')
| -rw-r--r-- | map/map_one.cub | 6 | ||||
| -rw-r--r-- | map/map_two.cub | 2 |
2 files changed, 1 insertions, 7 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 diff --git a/map/map_two.cub b/map/map_two.cub index 309485b..8e4607f 100644 --- a/map/map_two.cub +++ b/map/map_two.cub @@ -14,7 +14,7 @@ F ./media/img/arrow2.xpm 100000000000000000000000000000000001 100000000000030000000000000000000001 100000000000000000000000000000000001 -10000000000002222222200W000000000001 +10000000000002020202000W000000000001 100000000000000000000000000000000001 100000000000040000000000000000000001 100000000000000000000000000000000001 |