fix: conflicts

2020-08-12 11:12:22 +02:00
parent 6db2d91a01 c4b6c13975
commit 3c8976e44c
45 changed files with 787 additions and 144 deletions
@@ -45,6 +45,9 @@ jobs:
        run: git diff --quiet origin/master HEAD -- yarn.lock
        continue-on-error: true

+      - name: verify doc links
+        run: node docs/verify-links.js
+
      - name: yarn install
        run: yarn install --frozen-lockfile