From 466ace75cd266200f322aaf39f0403938b5ad3ab Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 5 May 2023 12:23:44 +0200
Subject: [PATCH] Remove update of cypress version of this pr.

---
 e2e-tests/yarn.lock | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/e2e-tests/yarn.lock b/e2e-tests/yarn.lock
index 6f86093d0..1fffb6870 100644
--- a/e2e-tests/yarn.lock
+++ b/e2e-tests/yarn.lock
@@ -2194,15 +2194,9 @@ crypto-browserify@^3.0.0:
     randomfill "^1.0.3"
 
 cypress@^12.7.0:
-<<<<<<< HEAD
-  version "12.9.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.9.0.tgz#e6ab43cf329fd7c821ef7645517649d72ccf0a12"
-  integrity sha512-Ofe09LbHKgSqX89Iy1xen2WvpgbvNxDzsWx3mgU1mfILouELeXYGwIib3ItCwoRrRifoQwcBFmY54Vs0zw7QCg==
-=======
   version "12.8.1"
   resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.8.1.tgz#0c6e67f34554d553138697aaf349b637d80004eb"
   integrity sha512-lIFbKdaSYAOarNLHNFa2aPZu6YSF+8UY4VRXMxJrFUnk6RvfG0AWsZ7/qle/aIz30TNUD4aOihz2ZgS4vuQVSA==
->>>>>>> master
   dependencies:
     "@cypress/request" "^2.88.10"
     "@cypress/xvfb" "^1.2.4"