Merge branch 'team1' into sakiyama_conflict1

# Conflicts:
#	ことわざ_team1.txt
This commit is contained in:
s-sakiyama
2026-09-07 16:48:24 +09:00

View File

@@ -3,4 +3,6 @@
〇二兎を追う者は一兎をも得ず 遠藤
〇塞翁が馬 遠藤2
〇身から出た錆 崎山