From 9411c73cf8ac2f036ce21c99962788e59148158c Mon Sep 17 00:00:00 2001 From: David Tardon Date: Wed, 6 Aug 2014 18:39:17 +0200 Subject: update help ids for Resolve Conflicts dlg Change-Id: I5b682de419e348bfe46ac34fcd1ac72251cbef2d --- source/text/shared/guide/collab.xhp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/text/shared') diff --git a/source/text/shared/guide/collab.xhp b/source/text/shared/guide/collab.xhp index accd82fe80..22d675c4b2 100644 --- a/source/text/shared/guide/collab.xhp +++ b/source/text/shared/guide/collab.xhp @@ -64,15 +64,15 @@ The spreadsheet document is in shared mode. The user sees a message that the document is in shared mode and that some features are not available in this mode. The user can disable this message for the future. After clicking OK, the document is opened in shared mode. Resolve Conflicts dialog - + If the same contents are changed by different users, the Resolve Conflicts dialog opens. For each conflict, decide which changes to keep.Keep Mine - + Keeps your change, voids the other change.Keep Other - + Keeps the change of the other user, voids your change.Keep All Mine - + Keeps all your changes, voids all other changes.Keep All Others - + Keeps the changes of all other users, voids your changes. Saving a shared spreadsheet document User A saves a shared document. The following conditions can apply: -- cgit