From 91f83276ec6bf0d1f8856d3ff254818eff01554b Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Sat, 11 Apr 2020 01:15:03 +0900
Subject: [PATCH] =?utf8?q?[fix]=20#40282=20=E3=82=B3=E3=83=B3=E3=83=95?=
 =?utf8?q?=E3=83=AA=E3=82=AF=E3=83=88=E8=A7=A3=E6=B1=BA=E6=AE=8B=E3=81=97?=
 =?utf8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=EF=BC=8E=20/=20Resolve=20conflicts?=
 =?utf8?q?=20left=20behind.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/main-win.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/main-win.c b/src/main-win.c
index 1fd2615bf..442b97fbb 100644
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -3379,19 +3379,8 @@ LRESULT PASCAL AngbandWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
 	{
 		if (!game_in_progress || !current_world_ptr->character_generated)
 		{
-<<<<<<< HEAD
 			quit(NULL);
 			return 0;
-=======
-			msg_flag = FALSE;
-			if (p_ptr->chp < 0) p_ptr->is_dead = FALSE;
-			exe_write_diary(p_ptr, DIARY_GAMESTART, 0, _("----ゲーム中断----", "--- Saved and Exited Game ---"));
-
-			p_ptr->panic_save = 1;
-			signals_ignore_tstp();
-			(void)strcpy(p_ptr->died_from, _("(緊急セーブ)", "(panic save)"));
-			(void)save_player(p_ptr);
->>>>>>> aed56f4e1a8c71b3fc97b2fa5265f3c13efc2da1
 		}
 
 		msg_flag = FALSE;
-- 
2.11.0