chore: fix travis

brandonocasey · Oct 22, 2020 · 20dc4e5 · 20dc4e5
1 parent ce8eccf
commit 20dc4e5
Show file tree

Hide file tree

Showing 3 changed files with 1,613 additions and 1,583 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,8 @@
 sudo: false
 dist: trusty
 language: node_js
+env:
+  - NPM_MERGE_DRIVER_IGNORE_CI=true
 # node version is specified using the .nvmrc file
 before_install:
   - npm install -g greenkeeper-lockfile@1