chore(release): v1.14.2 [skip ci]

Author: github-actions[bot]

examples/cdk/CHANGELOG.md

@@ -3,6 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<<<<<<< HEAD
 ## [1.16.1](https://github.com/aws-powertools/powertools-lambda-typescript/compare/v1.16.0...v1.16.1) (2023-11-24)
 
 **Note:** Version bump only for package cdk-sample
@@ -19,6 +20,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 - **maintenance:** add support for nodejs20.x runtime ([#1790](https://github.com/aws-powertools/powertools-lambda-typescript/issues/1790)) ([6b9b1bc](https://github.com/aws-powertools/powertools-lambda-typescript/commit/6b9b1bcb9baf4b3d8e0e5ec6709594aca09bb033))
 
+=======
+>>>>>>> 38bc54f0 (chore(release): v1.14.2 [skip ci])
 ## [1.14.2](https://github.com/aws-powertools/powertools-lambda-typescript/compare/v1.14.1...v1.14.2) (2023-11-03)
 
 **Note:** Version bump only for package cdk-sample

examples/cdk/package.json

@@ -1,6 +1,11 @@
 {
   "name": "cdk-sample",
+<<<<<<< HEAD
   "version": "1.18.0",
+=======
+  "version": "1.14.2",
+>>>>>>> 38bc54f0 (chore(release): v1.14.2 [skip ci
+  ])
   "author": {
     "name": "Amazon Web Services",
     "url": "https://aws.amazon.com"

packages/commons/package.json

@@ -75,4 +75,4 @@
   "devDependencies": {
     "@aws-lambda-powertools/testing-utils": "file:../testing"
   }
-}
+}

packages/idempotency/package.json

@@ -136,4 +136,4 @@
     "aws-sdk-client-mock": "^3.0.1",
     "aws-sdk-client-mock-jest": "^3.0.1"
   }
-}
+}

packages/logger/package.json

@@ -100,4 +100,4 @@
     "serverless",
     "nodejs"
   ]
-}
+}

packages/metrics/package.json

@@ -99,4 +99,4 @@
     "serverless",
     "nodejs"
   ]
-}
+}

packages/metrics/tests/unit/Metrics.test.ts

@@ -1524,11 +1524,7 @@ describe('Class: Metrics', () => {
       });
 
       // Act
-<<<<<<< HEAD
       metrics.addMetric(testMetric, MetricUnit.Count, 10);
-=======
-      metrics.addMetric(testMetric, MetricUnits.Count, 10);
->>>>>>> 9b9fc927 (fix(metrics): deduplicate dimensions when serialising (#1780))
       metrics.addDimension('foo', 'baz');
       const loggedData = metrics.serializeMetrics();
 
@@ -1547,11 +1543,7 @@ describe('Class: Metrics', () => {
               Metrics: [
                 {
                   Name: testMetric,
-<<<<<<< HEAD
                   Unit: MetricUnit.Count,
-=======
-                  Unit: MetricUnits.Count,
->>>>>>> 9b9fc927 (fix(metrics): deduplicate dimensions when serialising (#1780))
                 },
               ],
               Namespace: TEST_NAMESPACE,

packages/parameters/package.json

@@ -198,4 +198,4 @@
       "optional": true
     }
   }
-}
+}

packages/testing/package.json

@@ -100,4 +100,4 @@
     "aws-cdk-lib": "^2.126.0",
     "esbuild": "^0.20.0"
   }
-}
+}

packages/tracer/package.json

@@ -105,4 +105,4 @@
     "serverless",
     "nodejs"
   ]
-}
+}