From b166c70a5f798ef61572cdc9565867685b19aa48 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 9 Nov 2018 16:38:16 +0100
Subject: [PATCH] Fix conflict when a user was reverting the latest patch from
 someone else

---
 www/common/sframe-app-framework.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js
index b26c60583..a19979c5b 100644
--- a/www/common/sframe-app-framework.js
+++ b/www/common/sframe-app-framework.js
@@ -259,6 +259,9 @@ define([
                 if (content === UNINITIALIZED) { return; }
                 throw new Error("Content must be an object or array, type is " + typeof(content));
             }
+
+            oldContent = content;
+
             if (Array.isArray(content)) {
                 // Pad
                 content.push({ metadata: cpNfInner.metadataMgr.getMetadataLazy() });