Merge branch 'issue-68' of https://github.com/excalidraw/excalidraw into issue-68

2020-01-03 21:46:20 +01:00 · 2020-01-03 21:46:20 +01:00 · 34d1f640af
commit 34d1f640af
parent 3aeed022b5 6599f97088
1 changed files with 4 additions and 0 deletions
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@ -15,6 +15,10 @@ jobs:
    - name: npm install, build, and test
      run: |
        npm ci
+<<<<<<< HEAD:.github/workflows/nodejs.yml
+=======
+        npm run build --if-present
+>>>>>>> 6599f97088dcda01d7b05abe9afc732165f0af62:.github/workflows/nodejs.yml
        npm run lint
        npm test
      env: