fix merge conflicts

2017-05-22 12:11:24 +02:00
parent 6e7fe87974 c45f08f147
commit 5179252d3b
11 changed files with 105 additions and 59 deletions
--- a/rpc.js
+++ b/rpc.js
@@ -13,7 +13,7 @@ var RPC = module.exports;

 var Store = require("./storage/file");

-var DEFAULT_LIMIT = 150 * 1024 * 1024;
+var DEFAULT_LIMIT = 50 * 1024 * 1024;

 var isValidId = function (chan) {
    return /^[a-fA-F0-9]/.test(chan) ||