resolve conflict with master/staging

5 years ago · 626a031115
parent 79f1280cf3 ff73e96cb8
commit 626a031115
1 changed files with 0 additions and 1 deletions
--- a/lib/storage/file.js
+++ b/lib/storage/file.js
@ -971,7 +971,6 @@ var trimChannel = function (env, channelName, hash, _cb) {
            var msg = Util.tryParse(s_msg);
            if (!msg) { return void readMore(); }
            var msgHash = Extras.getHash(msg[4]);
            if (msgHash === hash) {