fix: solve merge conflicts

Signed-off-by: Luka Trovic <luka@nextcloud.com>
2022-04-20 09:05:35 +02:00
parent 37b3f03809
commit 23ae20efe7
5 changed files with 335 additions and 2692 deletions
--- a/cypress/utils/index.js
+++ b/cypress/utils/index.js
@@ -0,0 +1 @@
+export const randHash = () => Math.random().toString(36).replace(/[^a-z]+/g, '').slice(0, 10)
				`@@ -0,0 +1 @@`
				`export const randHash = () => Math.random().toString(36).replace(/[^a-z]+/g, '').slice(0, 10)`