From 3e86003a1a12e32e3775785a5e78dd0d53653329 Mon Sep 17 00:00:00 2001
From: Garifullin-Farid <95081032+Garifullin-Farid@users.noreply.github.com>
Date: Sun, 19 May 2024 22:19:35 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0=E2=84=964?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Conflicts:
#	ProjectTank/ProjectTank/CollectionGenericObjects/CollectionType.cs
#	ProjectTank/ProjectTank/CollectionGenericObjects/StorageCollection.cs
#	ProjectTank/ProjectTank/FormBattleTankCollection.Designer.cs
#	ProjectTank/ProjectTank/FormBattleTankCollection.cs
---
 ProjectTank/ProjectTank/FormBattleTankCollection.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ProjectTank/ProjectTank/FormBattleTankCollection.cs b/ProjectTank/ProjectTank/FormBattleTankCollection.cs
index 265cbfe..51c762e 100644
--- a/ProjectTank/ProjectTank/FormBattleTankCollection.cs
+++ b/ProjectTank/ProjectTank/FormBattleTankCollection.cs
@@ -1,4 +1,4 @@
-using ProjectTank.CollectionGenericObjects;
+using ProjectTank.CollectionGenericObjects;
 using ProjectTank.Drawning;
 
 namespace ProjectTank
@@ -224,4 +224,4 @@ namespace ProjectTank
             RerfreshListBoxItems();
         }
     }
-}
+}
\ No newline at end of file