Fix conflict markers in map creation info.

2023-04-13 21:34:34 -04:00 · 2023-04-13 21:34:34 -04:00 · 05e4b43b88
parent 4217a11b56
commit 05e4b43b88
1 changed files with 0 additions and 4 deletions
--- a/azumauindo/misc/crashlanding1
+++ b/azumauindo/misc/crashlanding1
@ -7,11 +7,7 @@ enter_x 5
 enter_y 18
 msg
 Created:  2021-07-31 jason
-<<<<<<< Updated upstream
 Modified: 2022-01-03 jason
-=======
-Modified: 2022-01-02 Kevin Zheng
->>>>>>> Stashed changes
 endmsg
 outdoor 1
 end