2026_0910_AI_5G_Java_MUN/git-advance-lesson-team1
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'team1' into sakiyama_conflict1

Browse Source 
# Conflicts:
#	ことわざ_team1.txt
This commit is contained in:
s-sakiyama
2026-09-07 16:48:24 +09:00
parent ce5ee47525 b8de514400
commit 5b9d33d4de
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ことわざ_team1.txt
View File

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