Migrating to .NET 8

leandrocgsi · Feb 11, 2024 · b9ad7b7 · b9ad7b7
1 parent 9acc16b
commit b9ad7b7
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Tapioca.HATEOAS/Tapioca.HATEOAS.csproj b/Tapioca.HATEOAS/Tapioca.HATEOAS.csproj
@@ -6,11 +6,7 @@
 		<Nullable>enable</Nullable>
 		<NoWarn>8618</NoWarn>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-<<<<<<< HEAD
 		<Version>8.0.101.1</Version>
-=======
-		<Version>1.0.25</Version>
->>>>>>> 2119b568e40a6f05ea7197f5940e85e09e162cd1
 		<RepositoryUrl>https://github.com/leandrocgsi/Tapioca.HATEOAS/</RepositoryUrl>
 		<Description>This is a smart library to implements HATEOAS docummentation in your RESTFul API's</Description>
 		<Copyright>Copyright © Erudio Training - Consultoria e Treinamentos em TI LTDA 2024</Copyright>