From 3aadcbd9e865ee8d23f7a8e408943fec386fe390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Tue, 3 Oct 2017 16:58:59 +0200
Subject: [PATCH] Deleted a package.json

---
 package.json        | 32 ++++++++++++++++++++++++++++----
 server/package.json | 40 ----------------------------------------
 2 files changed, 28 insertions(+), 44 deletions(-)
 delete mode 100644 server/package.json

diff --git a/package.json b/package.json
index c57ff9a7..d4814d6e 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,9 @@
 {
   "name": "zoff",
-  "version": "1.0.0",
-  "description": "Zoff ====",
-  "main": "gulpfile.js",
+  "version": "2.0.2",
+  "description": "Zoff, the shared YouTube based radio services",
+  "main": "server/index.js",
   "scripts": {
-    "install": "cd server/ && npm install",
     "start": "node server/index.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -17,12 +16,37 @@
   "bugs": {
     "url": "https://github.com/zoff-music/zoff/issues"
   },
+  "author": {
+    "name": "Kasper Rynning Tønnesen",
+    "email": "kasper@kasperrt.no"
+  },
+  "devDependencies": {
+    "gulp-util": "~3.0.6",
+    "gulp": "~3.9.0",
+    "gulp-concat": "~2.6.0",
+    "gulp-uglifyjs": "~0.6.2"
+  },
   "homepage": "https://github.com/zoff-music/zoff#readme",
   "dependencies": {
     "gulp": "^3.9.1",
     "gulp-concat": "^2.6.1",
     "gulp-uglifyjs": "^0.6.2",
     "gulp-util": "^3.0.8",
+    "bad-words": "^1.5.1",
+    "body-parser": "^1.17.1",
+    "cookie-parser": "^1.4.3",
+    "cors-anywhere": "^0.2.3",
+    "emoji-strip": "^0.0.3",
+    "express": "^4.15.2",
+    "express-handlebars": "^3.0.0",
+    "express-subdomain": "^1.0.5",
+    "jimp": "^0.2.27",
+    "mongodb": "^2.0.27",
+    "mongojs": "^2.4.0",
+    "node-cryptojs-aes": "^0.4.0",
+    "nodemailer": "^4.0.1",
+    "request": "^2.72.0",
+    "socket.io": "^2.0.3",
     "uniqid": "^4.1.1"
   }
 }
diff --git a/server/package.json b/server/package.json
deleted file mode 100644
index 2ee1dbf8..00000000
--- a/server/package.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "name": "zoff",
-  "version": "2.0.2",
-  "description": "Zoff, the shared YouTube based radio services",
-  "dependencies": {
-    "bad-words": "^1.5.1",
-    "body-parser": "^1.17.1",
-    "cookie-parser": "^1.4.3",
-    "cors-anywhere": "^0.2.3",
-    "emoji-strip": "^0.0.3",
-    "express": "^4.15.2",
-    "express-handlebars": "^3.0.0",
-    "express-subdomain": "^1.0.5",
-    "jimp": "^0.2.27",
-    "mongodb": "^2.0.27",
-    "mongojs": "^2.4.0",
-    "node-cryptojs-aes": "^0.4.0",
-    "nodemailer": "^4.0.1",
-    "request": "^2.72.0",
-    "socket.io": "^2.0.3",
-    "uniqid": "^4.1.1"
-  },
-  "scripts": {
-      "start": "node index.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/zoff-music/zoff-server.git"
-  },
-  "author": {
-    "name": "Kasper Rynning Tønnesen",
-    "email": "kasper@kasperrt.no"
-  },
-  "devDependencies": {
-    "gulp-util": "~3.0.6",
-    "gulp": "~3.9.0",
-    "gulp-concat": "~2.6.0",
-    "gulp-uglifyjs": "~0.6.2"
-  }
-}