Fix an error created by the merge

This commit is contained in:
yflory 2016-09-22 16:34:06 +02:00
parent dde519795d
commit 73d5ea967b
2 changed files with 2 additions and 2 deletions

View File

@ -576,7 +576,7 @@ define([
} }
// Update the user list (metadata) from the hyperjson // Update the user list (metadata) from the hyperjson
updateUserList(userDoc); updateMetadata(userDoc);
editor.setValue(newDoc || Messages.codeInitialState); editor.setValue(newDoc || Messages.codeInitialState);

View File

@ -651,7 +651,7 @@ define([
applyHjson(shjson); applyHjson(shjson);
// Update the user list (metadata) from the hyperjson // Update the user list (metadata) from the hyperjson
updateUserList(shjson); updateMetadata(shjson);
if (Visible.isSupported()) { if (Visible.isSupported()) {
Visible.onChange(function (yes) { Visible.onChange(function (yes) {