Merge branch 'master' into cawllec/add-standardjs-linter

bugsnag · Jan 16, 2019 · b21261b · b21261b
2 parents 7f95e0e + ce1703d
commit b21261b
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/cli.js b/cli.js
@@ -57,7 +57,12 @@ const cli = meow(`
     w: 'add-wildcard-prefix'
   },
   string: [
+<<<<<<< HEAD
     'app-version'
+=======
+    'app-version',
+    'api-key',
+>>>>>>> master
   ],
   boolean: [
     'overwrite',
@@ -109,5 +114,7 @@ Promise.resolve()
     }
   })
   .then(() => {
-    return tasks.run().catch(() => {})
-  })
+    return tasks.run().catch(() => {
+      process.exitCode = 1;
+    });
+  });