From abc1496a466d2113171445f4e7c6db04fa941f73 Mon Sep 17 00:00:00 2001 From: gai101 Date: Sun, 29 Mar 2026 12:47:59 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index eeb8f8c..9df03a3 100644 --- a/README.md +++ b/README.md @@ -142,8 +142,5 @@ SourceTree の練習リポジトリです | 回転ずし | くら寿司 | | かず | つな | | rabeneko | マグロ | -<<<<<<< HEAD -| gaiji | はまち | -======= ->>>>>>> 41c9f8c1864144950632ec72826b74a7b513aef2 -| gaiji | たまご | \ No newline at end of file +| gaiji | たまご | +| gaiji | はまち | \ No newline at end of file From 18087515570f607dde0804db1903c80e5b0013c5 Mon Sep 17 00:00:00 2001 From: gai101 Date: Sun, 29 Mar 2026 12:56:57 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=81=AF=E3=81=BE=E3=81=A1=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9df03a3..157990f 100644 --- a/README.md +++ b/README.md @@ -143,4 +143,5 @@ SourceTree の練習リポジトリです | かず | つな | | rabeneko | マグロ | | gaiji | たまご | +| gaiji | はまち | | gaiji | はまち | \ No newline at end of file