fix: solve merge conflicts related to cypress setup

Browse Source

Signed-off-by: Luka Trovic <luka@nextcloud.com>

...

This commit is contained in:

Luka Trovic

2022-05-09 13:20:44 +01:00

parent 6518cd464c

commit 9c57243d5a

2 changed files with 2407 additions and 149 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2536

package-lock.json generated

File diff suppressed because it is too large Load Diff