Fixed nodejs.yml

6 years ago · 6a6a31d99c
1 changed files with 0 additions and 4 deletions
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@ -15,10 +15,6 @@ jobs:
				@@ -15,10 +15,6 @@ 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: