Fix an error created by the merge
This commit is contained in:
parent
dde519795d
commit
73d5ea967b
@ -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);
|
||||||
|
|
||||||
|
|||||||
@ -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) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user