Browse Source

fixed conflict

zhangweicheng 8 years ago
parent
commit
2d379675a0
1 changed files with 2 additions and 1 deletions
  1. 2 1
      package.json

+ 2 - 1
package.json

@@ -29,7 +29,8 @@
     "ua-parser-js": "^0.7.14",
     "uuid": "^3.1.0",
     "ioredis":"^3.1.4",
-    "log4js":"~2.3.3"
+    "log4js":"~2.3.3",
+    "pdfkit": "^0.8.2"
   },
   "scripts": {
     "start": "C:\\Users\\mai\\AppData\\Roaming\\npm\\babel-node.cmd server.js"