From 1f98ad94cc16c6881a9443b2451e51f16803e337 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 7 Jan 2021 12:47:17 +0100
Subject: [PATCH] Fix merge issues

---
 www/common/sframe-common.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/www/common/sframe-common.js b/www/common/sframe-common.js
index 54d760803..f88f98beb 100644
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -16,7 +16,6 @@ define([
     '/common/metadata-manager.js',
 
     '/customize/application_config.js',
-    '/common/outer/cache-store.js',
     '/common/common-realtime.js',
     '/common/common-util.js',
     '/common/common-hash.js',
@@ -42,7 +41,6 @@ define([
     MT,
     MetadataMgr,
     AppConfig,
-    Cache,
     CommonRealtime,
     Util,
     Hash,
@@ -189,7 +187,7 @@ define([
 
     funcs.getFileSize = function (channelId, cb) {
         nThen(function (waitFor) {
-            Cache.getBlobCache(channelId, waitFor(function(err, blob) {
+            ctx.cache.getBlobCache(channelId, waitFor(function(err, blob) {
                 if (err) { return; }
                 waitFor.abort();
                 cb(null, blob.length);