resolved conflict from v1.4-dev branch merge

RobHolme · Oct 8, 2022 · 19903dc · 19903dc
1 parent 8ac255e
commit 19903dc
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/HL7Listener.csproj b/HL7Listener.csproj
@@ -3,25 +3,16 @@
   <PropertyGroup>
   	<AssemblyName>HL7Listener</AssemblyName>
 	<OutputType>Exe</OutputType>
-<<<<<<< HEAD
-    <TargetFrameworks>net6.0;net48</TargetFrameworks>
-=======
     <TargetFramework>net6.0</TargetFramework>
->>>>>>> v1.4-dev
 	<EnableDefaultItems>true</EnableDefaultItems>
 	<PublishTrimmed>true</PublishTrimmed>
 	<PlatformTarget>x64</PlatformTarget>
 	<PublishTrimmed>true</PublishTrimmed>
 	<Authors>Rob Holme</Authors>
 	<Product>HL7 Listener</Product>
     <Description>Simple MLLP listener to accept HL7 v2.x messages</Description>
-<<<<<<< HEAD
-	<Version>1.3.1</Version>
-    <FileVersion>1.3.1.0</FileVersion>
-=======
 	<Version>1.4.0</Version>
     <FileVersion>1.4.0.0</FileVersion>
->>>>>>> v1.4-dev
 	<RepositoryUrl>https://github.com/RobHolme/HL7-Listener</RepositoryUrl>
   </PropertyGroup>
 </Project>