From cc7181244564486ba55f7a42a8a4cff84e190bba Mon Sep 17 00:00:00 2001
From: Ya Zhuang <zhuangya@bytedance.com>
Date: Tue, 31 May 2016 14:17:57 +0800
Subject: [PATCH] chore: npm testing script

---
 lib/requestHandler.js | 10 ----------
 package.json          |  1 -
 2 files changed, 11 deletions(-)

diff --git a/lib/requestHandler.js b/lib/requestHandler.js
index fa12692..f0f9a7e 100644
--- a/lib/requestHandler.js
+++ b/lib/requestHandler.js
@@ -233,13 +233,8 @@ function userRequestHandler(req,userRes){
                         resourceInfo.resHeader  = resHeader;
                         resourceInfo.resBody    = serverResData;
                         resourceInfo.length     = serverResData ? serverResData.length : 0;
-<<<<<<< HEAD
 
-                        GLOBAL.recorder && GLOBAL.recorder.updateRecord(resourceInfoId,resourceInfo);
-=======
-                        
                         global.recorder && global.recorder.updateRecord(resourceInfoId,resourceInfo);
->>>>>>> 6521604... change: discard decrpecated GLOBAL
 
                         callback();
 
@@ -378,13 +373,8 @@ function connectReqHandler(req, socket, head){
             resourceInfo.resHeader  = {};
             resourceInfo.resBody    = "";
             resourceInfo.length     = 0;
-<<<<<<< HEAD
 
-            GLOBAL.recorder && GLOBAL.recorder.updateRecord(resourceInfoId,resourceInfo);
-=======
-            
             global.recorder && global.recorder.updateRecord(resourceInfoId,resourceInfo);
->>>>>>> 6521604... change: discard decrpecated GLOBAL
 
             callback();
         }
diff --git a/package.json b/package.json
index d58f736..20e0181 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,6 @@
     "test": "sh test/test.sh",
     "testserver": "node test/server/startServer.js"
   },
-  "optionalDependencies": {},
   "repository": {
     "type": "git",
     "url": "https://github.com/alibaba/anyproxy"