New commit
コマンド完成
切り替えるので
ts
Merge remote-tracking branch 'origin/mozipi'

Conflicts:
	target/classes/META-INF/maven/mcmmorpggroup/flaggames/pom.properties
＼(^o^)／ｵﾜﾀ
Merge branch 'master' of https://github.com/MCMMORPGGroup/FlagGames.git

Conflicts:
	target/classes/META-INF/maven/mcmmorpggroup/flaggames/pom.properties