diff options
| author | salaaad2 <arthurdurant263@gmail.com> | 2020-03-11 20:42:12 +0100 |
|---|---|---|
| committer | salaaad2 <arthurdurant263@gmail.com> | 2020-03-11 20:42:12 +0100 |
| commit | ca5b3689894013365f617cb5513372e6031e8ae7 (patch) | |
| tree | 76fcd88c754cb29aaab3597eacc68b68eec15343 /map/map_one.cub | |
| parent | get merged (diff) | |
| download | 42-cub3d-ca5b3689894013365f617cb5513372e6031e8ae7.tar.gz 42-cub3d-ca5b3689894013365f617cb5513372e6031e8ae7.tar.bz2 42-cub3d-ca5b3689894013365f617cb5513372e6031e8ae7.tar.xz 42-cub3d-ca5b3689894013365f617cb5513372e6031e8ae7.tar.zst 42-cub3d-ca5b3689894013365f617cb5513372e6031e8ae7.zip | |
gang_gang
Diffstat (limited to '')
| -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 |