From 5a66115ebc1a9d28c564abb756565744b3e54e26 Mon Sep 17 00:00:00 2001
From: "h.hein" <26-h-kyaw-sakuracommunication@it-college.co.jp>
Date: Mon, 7 Sep 2026 12:52:11 +0900
Subject: [PATCH 1/5] =?UTF-8?q?=E3=83=98=E3=82=A4=E3=83=B3=E3=81=A7?=
 =?UTF-8?q?=E3=81=99?=
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..b0c3479 100644
--- a/コンフリクト.txt
+++ b/コンフリクト.txt
@@ -1 +1,2 @@
-コンフリクト
\ No newline at end of file
+コンフリクト
+　ヘインです。
\ No newline at end of file

From a66f740c275012a7a513a7c49bf1a2e9783d10ad Mon Sep 17 00:00:00 2001
From: m_ozawa <26-m-ozawa-swnet@it-college.co.jp>
Date: Mon, 7 Sep 2026 12:53:15 +0900
Subject: [PATCH 2/5] =?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=E3=80=80=E5=B0=8F?=
 =?UTF-8?q?=E6=BE=A4?=
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..2ae1109 100644
--- a/コンフリクト.txt
+++ b/コンフリクト.txt
@@ -1 +1,2 @@
-コンフリクト
\ No newline at end of file
+コンフリクト
+コンフリクトテスト　小澤
\ No newline at end of file

From 41c0e57faee7d3988228428e75a460343a0ddf86 Mon Sep 17 00:00:00 2001
From: y-ogawa <26-y-ogawa-tmn@it-college.co.jp>
Date: Mon, 7 Sep 2026 12:54:06 +0900
Subject: [PATCH 3/5] =?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=E3=81=A7=E3=81=99?=
 =?UTF-8?q?=E3=80=82?=
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..822200e 100644
--- a/コンフリクト.txt
+++ b/コンフリクト.txt
@@ -1 +1,2 @@
-コンフリクト
\ No newline at end of file
+コンフリクト
+コンフリクトテスト小川悠里
\ No newline at end of file

From 70a195a4b04e81425c1c808e013ff9040f6891a7 Mon Sep 17 00:00:00 2001
From: s-ohasi <26-o-m-stella-tecnica@it-college.jp>
Date: Mon, 7 Sep 2026 14:25:00 +0900
Subject: [PATCH 4/5] =?UTF-8?q?=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88?=
 =?UTF-8?q?=E3=80=80=E5=A4=A7=E6=A9=8B?=
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 cc9b165..cf52f65 100644
--- a/コンフリクト.txt
+++ b/コンフリクト.txt
@@ -1 +1 @@
-コンフリクト　松田桜育
\ No newline at end of file
+コンフリクトテスト　大橋咲蘭
\ No newline at end of file

From 716c36c0ec00bfabc1b2a510da4b4120fbb5cf88 Mon Sep 17 00:00:00 2001
From: "h.hein" <26-h-kyaw-sakuracommunication@it-college.co.jp>
Date: Mon, 7 Sep 2026 14:47:46 +0900
Subject: [PATCH 5/5] =?UTF-8?q?=E3=81=93=E3=81=A8=E3=82=8F=E3=81=96?=
 =?UTF-8?q?=E3=80=80=E3=83=98=E3=82=A4=E3=83=B3?=
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..2238cf7
--- /dev/null
+++ b/ことわざ_チーム２.txt
@@ -0,0 +1 @@
+郷に入っては郷に従え　ヘイン
\ No newline at end of file