From e213785a9e01bdb55ff0efd17469ad014d6b531f Mon Sep 17 00:00:00 2001
From: "h.hein" <26-h-kyaw-sakuracommunication@it-college.co.jp>
Date: Mon, 7 Sep 2026 12:43:58 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=95=E3=83=AA=E3=82=AF?=
 =?UTF-8?q?=E3=83=88=E4=BD=9C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md        | 4 ++++
 コンフリクト.txt | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 コンフリクト.txt

diff --git a/README.md b/README.md
index 54c0124..486d1d6 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,6 @@
 # git-advance-lesson-team2
 
+
+
+コンフリクト作成しました。
+
diff --git a/コンフリクト.txt b/コンフリクト.txt
new file mode 100644
index 0000000..60857a2
--- /dev/null
+++ b/コンフリクト.txt
@@ -0,0 +1 @@
+コンフリクト
\ No newline at end of file