From ebc524686569e3822f734529bba3a54bc87bd254 Mon Sep 17 00:00:00 2001
From: m-endo <26-s-i-tm-nets@it-college.jp>
Date: Mon, 7 Sep 2026 15:13:54 +0900
Subject: [PATCH] =?UTF-8?q?Merge=20branch=20'endo-=E3=82=B3=E3=83=B3?=
 =?UTF-8?q?=E3=83=95=E3=83=AA=E3=82=AF=E3=83=881'=20into=20team1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Conflicts:
#	コンフリクト.txt
テスト
---
 遠藤_コンフリクト.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 遠藤_コンフリクト.txt

diff --git a/遠藤_コンフリクト.txt b/遠藤_コンフリクト.txt
new file mode 100644
index 0000000..4217e69
--- /dev/null
+++ b/遠藤_コンフリクト.txt
@@ -0,0 +1 @@
+コンフリクトテスト　遠藤
\ No newline at end of file