fixed merge conflicts

[henge/kiak.git] / package.json

diff --git a/package.json b/package.json
index e9ab6fa..3122b2b 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,22 +1,33 @@
-{
-  "name": "strapp",
-  "version": "0.0.0",
-  "description": "A distributed desktop sharer",
-  "main": "main.js",
-  "scripts": {
-    "start": "electron ."
-  },
-  "repository": "",
-  "keywords": [
-    "WebRTC",
-    "Cool",
-    "Screen Sharing",
-    "Distributed",
-    "Prototype"
-  ],
-  "author": "Jordan Lavatai",
-  "license": "MIT",
-  "devDependencies": {
-    "electron": "~1.6.2"
-  }
-}
+{\r
+  "name": "strapp",\r
+  "version": "0.0.1",\r
+  "description": "A distributed webrtc bootstrapper",\r
+  "main": "main.js",\r
+  "scripts": {\r
+    "start": "electron ."\r
+  },\r
+  "repository": {\r
+    "type": "git",\r
+    "url": "git@github.com:Jlavatai/strapp.git"\r
+  },\r
+  "keywords": [\r
+    "WebRTC",\r
+    "Cool",\r
+    "Desktop Sharing",\r
+    "Distributed",\r
+    "Prototype"\r
+  ],\r
+  "author": [\r
+    "Jordan Lavatai",\r
+    "Ken Grimes"\r
+  ],\r
+  "license": "AGPL-3.0",\r
+  "devDependencies": {},\r
+  "dependencies": {\r
+    "electron": "^1.6.11",\r
+    "get-port": "^3.1.0",\r
+    "mime": "^1.3.6",\r
+    "minimist": "^1.2.0",\r
+    "ws": "^3.0.0"\r
+  }\r
+}\r