fix merge conflict

5 years ago · 6ae6445d95
parent f8f3a48e8b a9f8402110
commit 6ae6445d95
1 changed files with 1 additions and 3 deletions
--- a/www/common/outer/messenger.js
+++ b/www/common/outer/messenger.js
@ -893,9 +893,7 @@ define([
    };

    var clearOwnedChannel = function (ctx, id, cb) {
-        // XXX clients is undefined if you try to clear history from contacts
-        // while not using workers
-        var channel = ctx.clients[id];
+        var channel = ctx.channels[id];
        if (!channel) { return void cb({error: 'NO_CHANNEL'}); }
        if (!ctx.store.rpc) { return void cb({error: 'RPC_NOT_READY'}); }
        ctx.store.rpc.clearOwnedChannel(id, function (err) {