From 9286f993e6e1649c7e29db13c8f0fddd0936b6d8 Mon Sep 17 00:00:00 2001 From: Richard Keit Date: Thu, 19 Dec 2024 10:02:39 +1100 Subject: [PATCH] updated merge --- .../test/__snapshots__/operations-stack.test.ts.snap | 4 ---- 1 file changed, 4 deletions(-) diff --git a/source/packages/@aws-accelerator/accelerator/test/__snapshots__/operations-stack.test.ts.snap b/source/packages/@aws-accelerator/accelerator/test/__snapshots__/operations-stack.test.ts.snap index 11fed9978..010eda60e 100644 --- a/source/packages/@aws-accelerator/accelerator/test/__snapshots__/operations-stack.test.ts.snap +++ b/source/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", },