fix conflicts

This commit is contained in:
Nikita 2025-02-22 23:01:34 +04:00
commit 91bc8d454c
3 changed files with 5 additions and 5 deletions

View File

@ -30,11 +30,11 @@ public class DrawningBoat
/// </summary>
protected int? _startPosY;
/// <summary>
/// Ширина прорисовки катамарана
/// Ширина прорисовки лодки
/// </summary>
private readonly int _drawningBoatWidth = 60;
/// <summary>
/// Высота прорисовки катамарана
/// Высота прорисовки лодки
/// </summary>
private readonly int _drawningBoatHeight = 22;
/// <summary>

View File

@ -12,7 +12,7 @@ namespace ProjectCatamaran.MovementStrategy
/// <summary>
/// Поле-объект класса DrawningBoat или его наследника
/// </summary>
private readonly DrawningBoat _boat = null;
private readonly DrawningBoat? _boat = null;
/// <summary>
/// Конструктор
/// </summary>