Merging

Matt Gaunt · Matt Gaunt · commit 1b3286427625 · 2016-09-17T18:18:56.000-07:00
diff --git a/bin/web-push.js b/bin/web-push.js
@@ -66,3 +66,7 @@ webPush.sendNotification(endpoint, params).then(() => {
 }).then(() => {
   process.exit(0);
 });
+<<<<<<< HEAD
+=======
+
+>>>>>>> master
