Merge pull request #161 from kazz210/add-hamachi

好きな寿司のネタにはまちを追加
progedu · Oct 4, 2024 · 9983364 · 9983364
2 parents b32ee8f + f0a10f0
commit 9983364
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -130,4 +130,8 @@ SourceTree の練習リポジトリです
 | maguro       | マグロ                           |
 | aiueo        | マグロ                           |
 | kanakana     | ホタテ                           |
+<<<<<<< HEAD
 | kazz210      | まぐろ                           |
+| kazz210      | はまち                           |
+=======
+>>>>>>> upstream/main