summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/swriter/guide/word_completion.xhp
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/source/text/swriter/guide/word_completion.xhp')
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/word_completion.xhp4
1 files changed, 0 insertions, 4 deletions
diff --git a/helpcontent2/source/text/swriter/guide/word_completion.xhp b/helpcontent2/source/text/swriter/guide/word_completion.xhp
index d498dfd623..4d9745cff0 100755
--- a/helpcontent2/source/text/swriter/guide/word_completion.xhp
+++ b/helpcontent2/source/text/swriter/guide/word_completion.xhp
@@ -54,11 +54,7 @@
<paragraph role="heading" id="par_idN10751" xml-lang="en-US" level="1" l10n="NEW"><variable id="word_completion"><link href="text/swriter/guide/word_completion.xhp">Word Completion for Text Documents</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_idN1076F" xml-lang="en-US" l10n="NEW">$[officename] collects words that you frequently use in the current session. When you later type the first three letters of a collected word, $[officename] automatically completes the word. </paragraph>
-<<<<<<< .working
-<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="91">If there is more than one word in the AutoCorrect memory that matches the three letters that you type, press Ctrl+Tab to cycle through the available words. To cycle in the opposite direction, press Ctrl+Shift+Tab. </paragraph>
-=======
<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="91">If there is more than one word in the AutoCorrect memory that matches the three letters that you type, press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</item> to cycle through the available words. To cycle in the opposite direction, press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Tab</item>. </paragraph>
->>>>>>> .merge-right.r265757
<paragraph role="heading" id="par_idN1078D" xml-lang="en-US" level="2" l10n="NEW"> Using word completion </paragraph>
<list type="ordered">
<listitem>