From 69c639d5c6dadb6e574df8fad08b1a5217f65bfd Mon Sep 17 00:00:00 2001
From: Keegan <mhsjlw@aol.com>
Date: Thu, 25 Feb 2016 06:35:33 -0500
Subject: [PATCH] oops

---
 package.json | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 72fb6a4..196237d 100644
--- a/package.json
+++ b/package.json
@@ -19,13 +19,8 @@
   "license": "MIT",
   "dependencies": {
     "babel-runtime": "^5.4.4",
-<<<<<<< 6dfd78b12f3010ef09633a3bec362d8d552d8452
-    "protodef": "^1.0.0",
-    "xml2js": "0.4.16"
-=======
-    "protodef": "0.2.2",
+    "protodef": "^1.1.2",
     "raknet": "^1.1.0"
->>>>>>> update to 14.0 and add node-raknet
   },
   "devDependencies": {
     "gulp": "3.8.11",