Remove merge conflicts

Ovyerus · Ovyerus · commit 6b962cf1648c · 2017-10-26T15:14:33.000+11:00
diff --git a/lib/Handler.js b/lib/Handler.js
@@ -1,10 +1,7 @@
 /**
  * @file Weeb.sh wrapper for Node.js
  * @author Capuccino
-<<<<<<< HEAD
-=======
  * @author Ovyerus
->>>>>>> 482171a5c961c1ccf88797a0630e665b6626a60b
  */
 
 const https = require('https');
diff --git a/package.json b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "wolken",
-<<<<<<< HEAD
-  "version": "0.0.3b",
-=======
-  "version": "0.0.3-BETA",
->>>>>>> 482171a5c961c1ccf88797a0630e665b6626a60b
+  "version": "0.1.0",
   "description": "a weeb.sh wrapper",
   "main": "index.js",
   "scripts": {
