Merge branch 'team1' into sakiyama_conflict1

# Conflicts: # ことわざ_team1.txt
コメント追加
2026-09-07 16:48:24 +09:00 · 2026-09-07 16:27:38 +09:00 · 2026-09-07 15:59:52 +09:00
1 changed files with 2 additions and 0 deletions
--- a/ことわざ_team1.txt
+++ b/ことわざ_team1.txt
@@ -3,4 +3,6 @@
 〇二兎を追う者は一兎をも得ず　遠藤
 〇塞翁が馬　遠藤２
 〇身から出た錆　崎山
Author	SHA1	Message	Date
s-sakiyama	5b9d33d4de	Merge branch 'team1' into sakiyama_conflict1 # Conflicts: # ことわざ_team1.txt	2026-09-07 16:48:24 +09:00
m-endo	b8de514400	コメント追加	2026-09-07 16:27:38 +09:00
m-endo	44292fe929	ことわざ追加	2026-09-07 15:59:52 +09:00