Fixed the Merge issue with the csproj file
This commit is contained in:
@@ -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 />
|
||||
|
Reference in New Issue
Block a user