Removing merge conflict markers

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