From 73d5ea967b77b7a709fa88376cb2486b0e580963 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 22 Sep 2016 16:34:06 +0200
Subject: [PATCH] Fix an error created by the merge

---
 www/code/main.js | 2 +-
 www/pad/main.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/code/main.js b/www/code/main.js
index 41e089e70..684a813f1 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -576,7 +576,7 @@ define([
                 }
 
                 // Update the user list (metadata) from the hyperjson
-                updateUserList(userDoc);
+                updateMetadata(userDoc);
 
                 editor.setValue(newDoc || Messages.codeInitialState);
 
diff --git a/www/pad/main.js b/www/pad/main.js
index 6399da196..f104b4fc4 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -651,7 +651,7 @@ define([
                 applyHjson(shjson);
 
                 // Update the user list (metadata) from the hyperjson
-                updateUserList(shjson);
+                updateMetadata(shjson);
 
                 if (Visible.isSupported()) {
                     Visible.onChange(function (yes) {