From fade11cda8b54d8d8887c00a793579857b8d0a1a Mon Sep 17 00:00:00 2001 From: Garifullin-Farid <95081032+Garifullin-Farid@users.noreply.github.com> Date: Sun, 19 May 2024 18:36:55 +0400 Subject: [PATCH] LabWork_2 # Conflicts: # ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs # ProjectTank/ProjectTank/Entities/EntityTank.cs # ProjectTank/ProjectTank/MovementStrategy/MoveableTank.cs --- ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs | 4 ++-- ProjectTank/ProjectTank/Entities/EntityTank.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs b/ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs index 8c7a0ac..289bdec 100644 --- a/ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs +++ b/ProjectTank/ProjectTank/Drawning/DrawningBattleTank.cs @@ -1,4 +1,4 @@ -namespace ProjectTank.Drawning; +namespace ProjectTank.Drawning; /// /// Класс, отвечающий за прорисовку и перемещение объекта-сущности /// @@ -8,7 +8,7 @@ public class DrawningBattleTank :DrawningTank /// Конструктор /// /// Скорость - /// Вес автомобиля + /// Вес /// Основной цвет /// Дополнительный цвет /// Признак наличия пушки diff --git a/ProjectTank/ProjectTank/Entities/EntityTank.cs b/ProjectTank/ProjectTank/Entities/EntityTank.cs index 3ec8cc3..e7d86c5 100644 --- a/ProjectTank/ProjectTank/Entities/EntityTank.cs +++ b/ProjectTank/ProjectTank/Entities/EntityTank.cs @@ -1,4 +1,4 @@ -namespace ProjectTank.Entities +namespace ProjectTank.Entities { public class EntityTank {