crossfire
/
maps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflict markers in map creation info.

master
SilverNexus 2023-04-13 21:34:34 -04:00
parent 4217a11b56
commit 05e4b43b88
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
azumauindo/misc/crashlanding1
View File

@ -7,11 +7,7 @@ enter_x 5
enter_y 18 enter_y 18
msg msg
Created: 2021-07-31 jason Created: 2021-07-31 jason
<<<<<<< Updated upstream
Modified: 2022-01-03 jason Modified: 2022-01-03 jason
=======
Modified: 2022-01-02 Kevin Zheng
>>>>>>> Stashed changes
endmsg endmsg
outdoor 1 outdoor 1
end end