From a4b88888358af0694ed0e1c4cc4e57609bacdba1 Mon Sep 17 00:00:00 2001
From: I1nur <tuxtarov0475@gmail.com>
Date: Fri, 20 Oct 2023 08:57:16 +0400
Subject: [PATCH] edited program.cs

---
 ProjectAntiAirCraftGun/Program.cs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/ProjectAntiAirCraftGun/Program.cs b/ProjectAntiAirCraftGun/Program.cs
index 9ed8a7c..ac95f11 100644
--- a/ProjectAntiAirCraftGun/Program.cs
+++ b/ProjectAntiAirCraftGun/Program.cs
@@ -1,7 +1,3 @@
-<<<<<<<< HEAD:ProjectAntiAirCraftGun/Program.cs
-
-========
->>>>>>>> 95bc229510ca5cbcf7ea504b21f471ecc7a7f53a:AntiAircraftGun/Program.cs
 namespace ProjectAntiAircraftGun
 {
     internal static class Program
@@ -15,11 +11,7 @@ namespace ProjectAntiAircraftGun
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-<<<<<<<< HEAD:ProjectAntiAirCraftGun/Program.cs
             Application.Run(new FormTankCollection());
-========
-            Application.Run(new FormAntiAircraftGun());
->>>>>>>> 95bc229510ca5cbcf7ea504b21f471ecc7a7f53a:AntiAircraftGun/Program.cs
         }
     }
 }
\ No newline at end of file