fix: merge conflict resolved

SoftTeam-Emergentes · Nov 12, 2023 · 3e0190c · 3e0190c
2 parents df26380 + 165b488
commit 3e0190c
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 28 deletions.
diff --git a/PERUSTARS/.gitignore b/PERUSTARS/.gitignore
@@ -272,3 +272,4 @@ __pycache__/
 # tools/
 
 # End of https://www.toptal.com/developers/gitignore/api/aspnetcore
+
diff --git a/PERUSTARS/PERUSTARS/ArtworkManagement/Interfaces/REST/ArtworkRecommendationsController.cs b/PERUSTARS/PERUSTARS/ArtworkManagement/Interfaces/REST/ArtworkRecommendationsController.cs
@@ -10,7 +10,7 @@
 
 namespace PERUSTARS.ArtworkManagement.Interfaces.REST
 {
-    [Route("api/[controller]")]
+    [Route("api/v1/[controller]")]
     [ApiController]
     public class ArtworkRecommendationsController : ControllerBase
     {

diff --git a/PERUSTARS/PERUSTARS/ArtworkManagement/Interfaces/REST/ArtworkReviewsController.cs b/PERUSTARS/PERUSTARS/ArtworkManagement/Interfaces/REST/ArtworkReviewsController.cs
@@ -12,7 +12,7 @@
 
 namespace PERUSTARS.ArtworkManagement.Interfaces.REST
 {
-    [Route("api/[controller]")]
+    [Route("api/v1/[controller]")]
     [ApiController]
     public class ArtworkReviewsController : ControllerBase
     {

diff --git a/PERUSTARS/PERUSTARS/ArtworkManagement/Interfaces/REST/ArtworksController.cs b/PERUSTARS/PERUSTARS/ArtworkManagement/Interfaces/REST/ArtworksController.cs
@@ -12,7 +12,7 @@
 
 namespace PERUSTARS.ArtworkManagement.Interfaces.REST
 {
-    [Route("api/[controller]")]
+    [Route("api/v1/[controller]")]
     [ApiController]
     public class ArtworksController : ControllerBase
     {

diff --git a/PERUSTARS/PERUSTARS/ArtworkManagement/Interfaces/REST/HobbyistFavoriteArtworksController.cs b/PERUSTARS/PERUSTARS/ArtworkManagement/Interfaces/REST/HobbyistFavoriteArtworksController.cs
@@ -11,7 +11,7 @@
 
 namespace PERUSTARS.ArtworkManagement.Interfaces.REST
 {
-    [Route("api/[controller]")]
+    [Route("api/v1/[controller]")]
     [ApiController]
     public class HobbyistFavoriteArtworksController : ControllerBase
     {

diff --git a/PERUSTARS/PERUSTARS/bin/Debug/net5.0/PERUSTARS.dll b/PERUSTARS/PERUSTARS/bin/Debug/net5.0/PERUSTARS.dll
diff --git a/PERUSTARS/PERUSTARS/bin/Debug/net5.0/PERUSTARS.pdb b/PERUSTARS/PERUSTARS/bin/Debug/net5.0/PERUSTARS.pdb
diff --git a/PERUSTARS/PERUSTARS/bin/Debug/net5.0/PERUSTARS.runtimeconfig.dev.json b/PERUSTARS/PERUSTARS/bin/Debug/net5.0/PERUSTARS.runtimeconfig.dev.json
@@ -1,8 +1,8 @@
 {
   "runtimeOptions": {
     "additionalProbingPaths": [
-      "C:\\Users\\Mauricio\\.dotnet\\store\\|arch|\\|tfm|",
-      "C:\\Users\\Mauricio\\.nuget\\packages"
+      "C:\\Users\\DiegoAlonso\\.dotnet\\store\\|arch|\\|tfm|",
+      "C:\\Users\\DiegoAlonso\\.nuget\\packages"
     ]
   }
 }
diff --git a/PERUSTARS/PERUSTARS/bin/Release/net5.0/PERUSTARS.dll b/PERUSTARS/PERUSTARS/bin/Release/net5.0/PERUSTARS.dll
diff --git a/PERUSTARS/PERUSTARS/bin/Release/net5.0/PERUSTARS.pdb b/PERUSTARS/PERUSTARS/bin/Release/net5.0/PERUSTARS.pdb
diff --git a/PERUSTARS/PERUSTARS/bin/Release/net5.0/appsettings.json b/PERUSTARS/PERUSTARS/bin/Release/net5.0/appsettings.json
Original file line number	Diff line number	Diff line change
Expand Up		@@ -272,3 +272,4 @@ __pycache__/
		# tools/

		# End of https://www.toptal.com/developers/gitignore/api/aspnetcore