updated merge

awslabs · Dec 18, 2024 · 9286f99 · 9286f99
1 parent a48c639
commit 9286f99
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/...ce/packages/@aws-accelerator/accelerator/test/__snapshots__/operations-stack.test.ts.snap b/...ce/packages/@aws-accelerator/accelerator/test/__snapshots__/operations-stack.test.ts.snap
@@ -1134,11 +1134,7 @@ exports[`OperationsStack Construct(OperationsStack):  Snapshot Test 1`] = `
       "Properties": {
         "Name": "/accelerator/AWSAccelerator-OperationsStack-111111111111-us-east-1/version",
         "Type": "String",
-<<<<<<< HEAD
         "Value": "1.11.0",
-=======
-        "Value": "1.10.1",
->>>>>>> d8fe87d61 (release/v1.10.1)
       },
       "Type": "AWS::SSM::Parameter",
     },