fix: resolve merge conflicts

Signed-off-by: Luka Trovic <luka@nextcloud.com>
This commit is contained in:
Luka Trovic
2022-05-09 12:11:17 +01:00
parent 7e32a16969
commit 6518cd464c
7 changed files with 37 additions and 23 deletions

View File

@@ -82,7 +82,7 @@
cy.get('.app-navigation button.app-navigation-toggle').click()
cy.get('#app-navigation-vue .app-navigation__list .app-navigation-entry')
.eq(1)
.eq(3)
.find('a')
.first()
.click({force: true})
@@ -100,8 +100,8 @@
cy.get('.app-navigation button.app-navigation-toggle').click()
cy.get('#app-navigation-vue .app-navigation__list .app-navigation-entry')
.eq(1)
.find('.app-navigation-entry__children .app-navigation-entry a.app-navigation-entry-link')
.eq(3)
.find('a.app-navigation-entry-link')
.first()
.click({force: true})
@@ -111,5 +111,4 @@
cy.get('#stack-add form input[type=submit]')
.first()
.click()
})
})