conflictを意図しています2 by yoshihito

6b1943bf · yoshihito.saito · 1a31b835 · 6b1943bf
Commit 6b1943bf authored Jul 03, 2026 by yoshihito.saito
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

hello.c hello.c +1 -1

No files found.
--- a/hello.c
+++ b/hello.c
 #include <stdio.h>
 int main(void) {
-    printf("hello, conflict!\n");
+    printf("hello, conflict2!\n");
 }
\ No newline at end of file