Fix an error created by the merge

8 years ago · 73d5ea967b
parent dde519795d
commit 73d5ea967b
2 changed files with 2 additions and 2 deletions
--- 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);

--- 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) {