From 05e4b43b88f13e87266ab07bbe17b667a321c60d Mon Sep 17 00:00:00 2001
From: SilverNexus <hawkins280@proton.me>
Date: Thu, 13 Apr 2023 21:34:34 -0400
Subject: [PATCH] Fix conflict markers in map creation info.

---
 azumauindo/misc/crashlanding1 | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/azumauindo/misc/crashlanding1 b/azumauindo/misc/crashlanding1
index af343435d..45e6842dc 100644
--- 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