Fixed merge conflict

slackapi · Jan 4, 2021 · 5fbfcbb · 5fbfcbb
2 parents 377c3af + e05581f
commit 5fbfcbb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -13,6 +13,7 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    timeout-minutes: 10
 
     strategy:
       matrix:
@@ -28,4 +29,4 @@ jobs:
     - run: npm run setup
     - run: npm run lint
     - run: npm run test
-    # - run: npm run coverage
+    # - run: npm run coverage