diff options
| author | Maximilian Odendahl <mod@openoffice.org> | 2009-01-08 08:23:25 +0000 |
|---|---|---|
| committer | Maximilian Odendahl <mod@openoffice.org> | 2009-01-08 08:23:25 +0000 |
| commit | 4661645ceb22a3abeaea3fb3435e3325212dc9be (patch) | |
| tree | d44d98102e00bf75c0d893713de9c1636679ae79 /helpcontent2/source/text/shared/00/00000406.xhp | |
| parent | 0566fe1d60f5e764fea219e11683e8b0dbf498eb (diff) | |
#i10000# remove merge markers in help files
Diffstat (limited to 'helpcontent2/source/text/shared/00/00000406.xhp')
| -rw-r--r-- | helpcontent2/source/text/shared/00/00000406.xhp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/helpcontent2/source/text/shared/00/00000406.xhp b/helpcontent2/source/text/shared/00/00000406.xhp index bd190df209..cd019d9589 100644 --- a/helpcontent2/source/text/shared/00/00000406.xhp +++ b/helpcontent2/source/text/shared/00/00000406.xhp @@ -49,11 +49,7 @@ <tablerow> <tablecell> <paragraph role="paragraph" id="par_id3153323" xml-lang="en-US" l10n="E"> -<<<<<<< .working <image id="img_id3154894" src="res/commandimagelist/sc_gallery.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154894" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt> -======= -<image id="img_id3154894" src="res/commandimagelist/sc_gallery.png" width="0.1665in" height="0.1665in"><alt id="alt_id3154894" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt> ->>>>>>> .merge-right.r265757 </image></paragraph> </tablecell> <tablecell> @@ -79,13 +75,8 @@ <image id="img_id3153665" src="res/commandimagelist/sc_spelling.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153665" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt> </image></paragraph> </tablecell> -<<<<<<< .working -<tablecell> -<paragraph role="paragraph" id="par_id3157809" xml-lang="en-US" l10n="U" oldref="4">Spellcheck</paragraph> -======= <tablecell> <paragraph role="paragraph" id="par_id3157809" xml-lang="en-US" l10n="U" oldref="4">Spelling and Grammar</paragraph> ->>>>>>> .merge-right.r265757 </tablecell> </tablerow> </table> @@ -113,12 +104,8 @@ </section> <paragraph role="paragraph" id="par_idN107E9" xml-lang="en-US" l10n="NEW"><variable id="mediaplayer">Choose <emph>Tools - Media Player</emph> </variable></paragraph> -<<<<<<< .working -<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="CHG" oldref="13"><variable id="makro">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>, or press Alt+F11 (if not assigned by your system) -======= <paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="CHG" oldref="13"><variable id="makro">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>, or press <switchinline select="sys"><caseinline select="MAC">Option </caseinline><defaultinline>Alt</defaultinline></switchinline>+F11 (if not assigned by your system) ->>>>>>> .merge-right.r265757 </variable></paragraph> <section id="recordmacro"> <paragraph role="paragraph" id="par_id3149456" xml-lang="en-US" l10n="U" oldref="155">Choose <emph>Tools - Macros - Record Macro</emph> @@ -154,12 +141,7 @@ <emph> Options</emph> </variable></paragraph> <paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="51"><variable id="autokooptionen">Choose <emph>Tools - AutoCorrect</emph> -<<<<<<< .working -<emph> Options</emph> -<emph>- Options</emph> tab -======= <emph>- Options</emph>tab ->>>>>>> .merge-right.r265757 </variable></paragraph> <paragraph role="paragraph" id="par_id1978514" xml-lang="en-US" l10n="NEW"><variable id="autokosmarttags">Choose <emph>Tools - AutoCorrect Options- Smart Tags</emph> tab </variable></paragraph> |