From 6b1943bf1041cb3223d67e98e8e91a8c1cc3946d Mon Sep 17 00:00:00 2001
From: "yoshihito.saito" <yoshihito.saito@togawa.cs.waseda.ac.jp>
Date: Fri, 3 Jul 2026 14:42:58 +0900
Subject: [PATCH] =?UTF-8?q?conflict=E3=82=92=E6=84=8F=E5=9B=B3=E3=81=97?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=BE=E3=81=992=20by=20yoshihito?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hello.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hello.c b/hello.c
index 5efc719..8ada163 100644
--- a/hello.c
+++ b/hello.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
 
 int main(void) {
-    printf("hello, conflict!\n");
+    printf("hello, conflict2!\n");
 }
\ No newline at end of file
-- 
2.22.0