From 2eedf04dff3231e8305251963a933d897ea4f1fb Mon Sep 17 00:00:00 2001 From: Yohay Nahmany Date: Thu, 12 Dec 2024 14:48:43 +0100 Subject: [PATCH] wip --- CHANGELOG.md | 7 +++++++ package-lock.json | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d50d67a..9fa9251 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,19 @@ +<<<<<<< HEAD # [1.12.0](https://github.com/currents-dev/cypress-cloud/compare/v1.11.0...v1.12.0) (2024-11-22) +======= +## [1.12.1](https://github.com/currents-dev/cypress-cloud/compare/v1.11.0...v1.12.1) (2024-12-12) +>>>>>>> 50c40c9 (chore: relaese 1.12.1) ### Features * add previousCiBuildId to run creation ([d39614c](https://github.com/currents-dev/cypress-cloud/commit/d39614c0c7511701d3d431f37824a79cf40b561e)) +<<<<<<< HEAD * added env for machine id ([#218](https://github.com/currents-dev/cypress-cloud/issues/218)) ([34888c5](https://github.com/currents-dev/cypress-cloud/commit/34888c55ff2e39c1bfe9544b408dd3f8d6dd18fb)) +======= +>>>>>>> 50c40c9 (chore: relaese 1.12.1) # [1.11.0](https://github.com/currents-dev/cypress-cloud/compare/v1.10.2...v1.11.0) (2024-08-31) diff --git a/package-lock.json b/package-lock.json index ef1072a..5e7e89a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19823,7 +19823,11 @@ } }, "packages/cypress-cloud": { +<<<<<<< HEAD "version": "1.12.0", +======= + "version": "1.12.1", +>>>>>>> 50c40c9 (chore: relaese 1.12.1) "license": "GPL-3.0-or-later", "dependencies": { "@currents/commit-info": "1.0.1-beta.0",