+ ARM params

2024-10-29 13:19:41 -07:00 · 2024-10-29 13:19:41 -07:00 · 09499d25c3
--- 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>"
--- 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