From 071a22001fbd82099ac8ea02bffd23c86de6836f Mon Sep 17 00:00:00 2001
From: s-sakiyama <26-m-s-stella-tecnica@it-college.jp>
Date: Mon, 7 Sep 2026 14:16:53 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=95=E3=83=AA?=
 =?UTF-8?q?=E3=82=AF=E3=83=88=E3=83=86=E3=82=B9=E3=83=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 コンフリクト.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/コンフリクト.txt b/コンフリクト.txt
index 60857a2..b6ffdf7 100644
--- a/コンフリクト.txt
+++ b/コンフリクト.txt
@@ -1 +1,2 @@
-コンフリクト
\ No newline at end of file
+コンフリクト
+コンフリクトテスト_崎山
\ No newline at end of file

From 2d6b02d5742f2e23d7f0c4a12cd882a9db7c834c Mon Sep 17 00:00:00 2001
From: s-ikeda <26-s-ikeda-tmn@it-college.co.jp>
Date: Mon, 7 Sep 2026 14:18:10 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=95=E3=83=AA?=
 =?UTF-8?q?=E3=82=AF=E3=83=88=E3=83=86=E3=82=B9=E3=83=88=E6=B1=A0=E7=94=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 コンフリクト.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/コンフリクト.txt b/コンフリクト.txt
index 60857a2..a2f305e 100644
--- a/コンフリクト.txt
+++ b/コンフリクト.txt
@@ -1 +1 @@
-コンフリクト
\ No newline at end of file
+コンフリクトテスト池田
\ No newline at end of file