# Conflicts: # ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs # ProjectTank/ProjectTank/Entities/EntityTank.cs # ProjectTank/ProjectTank/FormBattleTank.cs # ProjectTank/ProjectTank/MovementStrategy/MoveableTank.cs
# Conflicts: # ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs # ProjectTank/ProjectTank/Entities/EntityTank.cs # ProjectTank/ProjectTank/FormBattleTank.cs # ProjectTank/ProjectTank/MovementStrategy/MoveableTank.cs