From 09499d25c35128f4471bfa331947c7d856e772b9 Mon Sep 17 00:00:00 2001
From: Charles Torre <ctorre@microsoft.com>
Date: Tue, 29 Oct 2024 13:19:41 -0700
Subject: [PATCH] + ARM params

---
 .../Deployment/service-fabric-healer.v1.2.15.parameters.json  | 4 ----
 FabricHealer.sln                                              | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Documentation/Deployment/service-fabric-healer.v1.2.15.parameters.json b/Documentation/Deployment/service-fabric-healer.v1.2.15.parameters.json
index d3a85e9..eb097fe 100644
--- a/Documentation/Deployment/service-fabric-healer.v1.2.15.parameters.json
+++ b/Documentation/Deployment/service-fabric-healer.v1.2.15.parameters.json
@@ -6,11 +6,7 @@
       "value": "<YOUR-CLUSTER-RESOURCE-NAME>"
     },
     "applicationTypeVersionFabricHealer": {
-<<<<<<<< HEAD:Documentation/Deployment/service-fabric-healer.v1.2.14.parameters.json
-      "value": "1.2.14"
-========
       "value": "1.2.15"
->>>>>>>> develop:Documentation/Deployment/service-fabric-healer.v1.2.15.parameters.json
     },
     "packageUrlFabricHealer": {
       "value": "<PUBLIC-ACCESSIBLE-URL-FOR-FABRICHEALER-SFPKG>"
diff --git a/FabricHealer.sln b/FabricHealer.sln
index b8db8b4..1aa8a2f 100644
--- a/FabricHealer.sln
+++ b/FabricHealer.sln
@@ -29,7 +29,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Documentation\OperationalTelemetry.md = Documentation\OperationalTelemetry.md
 		README.md = README.md
 		Documentation\Deployment\service-fabric-healer.json = Documentation\Deployment\service-fabric-healer.json
-		Documentation\Deployment\service-fabric-healer.v1.2.14.parameters.json = Documentation\Deployment\service-fabric-healer.v1.2.14.parameters.json
+		Documentation\Deployment\service-fabric-healer.v1.2.15.parameters.json = Documentation\Deployment\service-fabric-healer.v1.2.15.parameters.json
 		Documentation\Using.md = Documentation\Using.md
 	EndProjectSection
 EndProject