edited program.cs
This commit is contained in:
parent
74d5bec1e1
commit
a4b8888835
@ -1,7 +1,3 @@
|
|||||||
<<<<<<<< HEAD:ProjectAntiAirCraftGun/Program.cs
|
|
||||||
|
|
||||||
========
|
|
||||||
>>>>>>>> 95bc229510ca5cbcf7ea504b21f471ecc7a7f53a:AntiAircraftGun/Program.cs
|
|
||||||
namespace ProjectAntiAircraftGun
|
namespace ProjectAntiAircraftGun
|
||||||
{
|
{
|
||||||
internal static class Program
|
internal static class Program
|
||||||
@ -15,11 +11,7 @@ namespace ProjectAntiAircraftGun
|
|||||||
// To customize application configuration such as set high DPI settings or default font,
|
// To customize application configuration such as set high DPI settings or default font,
|
||||||
// see https://aka.ms/applicationconfiguration.
|
// see https://aka.ms/applicationconfiguration.
|
||||||
ApplicationConfiguration.Initialize();
|
ApplicationConfiguration.Initialize();
|
||||||
<<<<<<<< HEAD:ProjectAntiAirCraftGun/Program.cs
|
|
||||||
Application.Run(new FormTankCollection());
|
Application.Run(new FormTankCollection());
|
||||||
========
|
|
||||||
Application.Run(new FormAntiAircraftGun());
|
|
||||||
>>>>>>>> 95bc229510ca5cbcf7ea504b21f471ecc7a7f53a:AntiAircraftGun/Program.cs
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user