From 725f1e038e0beab46bbdd48cebcac47a1a1f461f Mon Sep 17 00:00:00 2001
From: o-matsuda <26-o-matsuda-stellatecnica@it-college.co.jp>
Date: Mon, 7 Sep 2026 12:47:21 +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=81=AB=E8=87=AA=E5=88=86=E3=81=AE=E5=90=8D?=
 =?UTF-8?q?=E5=89=8D=E3=82=92=E8=A8=98=E5=85=A5=E3=81=97=E3=81=BE=E3=81=97?=
 =?UTF-8?q?=E3=81=9F=E3=80=82?=
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..cc9b165 100644
--- a/コンフリクト.txt
+++ b/コンフリクト.txt
@@ -1 +1 @@
-コンフリクト
\ No newline at end of file
+コンフリクト　松田桜育
\ No newline at end of file

From bb4419a56c86e7c04072517e10d78e422069dbb7 Mon Sep 17 00:00:00 2001
From: s-ohasi <26-o-m-stella-tecnica@it-college.jp>
Date: Mon, 7 Sep 2026 12:58:01 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=A7=E6=A9=8B=E3=80=80=E3=82=B3?=
 =?UTF-8?q?=E3=83=B3=E3=83=95=E3=83=AA=E3=82=AF=E3=83=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 大橋　コンフリクト.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 大橋　コンフリクト.txt

diff --git a/大橋　コンフリクト.txt b/大橋　コンフリクト.txt
new file mode 100644
index 0000000..0d2086c
--- /dev/null
+++ b/大橋　コンフリクト.txt
@@ -0,0 +1 @@
+コンフリクト　大橋
\ No newline at end of file