# Conflicts:
#	src/network/Game.java
#	src/network/Player.java

# Conflicts:
#	out/test/battleship-student-project-2021/CoordTest.class
#	out/test/battleship-student-project-2021/NavyFleetTest.class
#	out/test/battleship-student-project-2021/RunningGameTest.class
#	out/test/battleship-student-project-2021/ShipTest.class

# Conflicts:
#	out/production/battleship-student-project-2021/info1/ships/NavyFleet.class

# Conflicts:
#	src/info1/ships/Ship.java

# Conflicts:
#	src/info1/ships/Ship.java