Fixed the Merge issue with the csproj file

This commit is contained in:
Eric Vasquez
2024-11-10 18:27:27 -06:00
parent 1eafad0159
commit 55adf28abc

View File

@@ -9,13 +9,8 @@
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>EveOPreview</RootNamespace>
<<<<<<< HEAD
<AssemblyName>EVE-O-Preview</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
=======
<AssemblyName>EVE-O Preview</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
>>>>>>> windows-build-pr-merg
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
@@ -290,4 +285,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>