fix: resolve merge conflicts

Signed-off-by: Luka Trovic <luka@nextcloud.com>
2022-05-09 12:11:17 +01:00
parent 7e32a16969
commit 6518cd464c
7 changed files with 37 additions and 23 deletions
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -26,11 +26,6 @@ jobs:
        server-versions: [ 'master' ]

    steps:
-      - name: Set up custom host for nextcloud
-        run: |
-            sudo echo "127.0.0.1 nextcloud.local" | sudo tee -a /etc/hosts
-            cat /etc/hosts
-
      - name: Use Node.js ${{ matrix.node-version }}
        uses: actions/setup-node@v1
        with: