From 4661645ceb22a3abeaea3fb3435e3325212dc9be Mon Sep 17 00:00:00 2001
From: Maximilian Odendahl <mod@openoffice.org>
Date: Thu, 8 Jan 2009 08:23:25 +0000
Subject: #i10000# remove merge markers in help files

---
 helpcontent2/source/text/shared/00/00000402.xhp    |  5 ---
 helpcontent2/source/text/shared/00/00000406.xhp    | 18 ---------
 .../source/text/shared/guide/paintbrush.xhp        |  9 -----
 helpcontent2/source/text/swriter/00/00000405.xhp   | 46 ----------------------
 .../source/text/swriter/guide/word_completion.xhp  |  4 --
 5 files changed, 82 deletions(-)

(limited to 'helpcontent2/source/text')

diff --git a/helpcontent2/source/text/shared/00/00000402.xhp b/helpcontent2/source/text/shared/00/00000402.xhp
index 42fdf8dd94..a21661bec0 100644
--- a/helpcontent2/source/text/shared/00/00000402.xhp
+++ b/helpcontent2/source/text/shared/00/00000402.xhp
@@ -10,13 +10,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
-<<<<<<< .working
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
-=======
  * $RCSfile: 00000402.xhp,v $
  * $Revision: 1.5.4.1 $
->>>>>>> .merge-right.r265757
  *
  * This file is part of OpenOffice.org.
  *
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>
diff --git a/helpcontent2/source/text/shared/guide/paintbrush.xhp b/helpcontent2/source/text/shared/guide/paintbrush.xhp
index 3a01cb4a87..bbd77b9aba 100755
--- a/helpcontent2/source/text/shared/guide/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/guide/paintbrush.xhp
@@ -60,11 +60,7 @@
 <paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="NEW">On the <emph>Standard Bar</emph>, click the <emph>Format Paintbrush</emph> icon.</paragraph>
 <paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" l10n="NEW">The cursor changes to a paint bucket.</paragraph>
 <paragraph role="tip" id="par_idN10663" xml-lang="en-US" l10n="CHG">If you want to apply the formatting to more than one selection, double-click the <emph>Format Paintbrush</emph> icon 
-<<<<<<< .working
 <image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.2228in" height="0.2228in"><alt id="alt_id209967" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
-=======
-<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665in" height="0.1665in"><alt id="alt_id209967" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
->>>>>>> .merge-right.r265757
 	</image>. After you apply all the formatting, click the icon again.</paragraph>
 </listitem>
 <listitem>
@@ -112,13 +108,8 @@
 <tablecell>
 <paragraph role="tablecontent" id="par_idN106C5" xml-lang="en-US" l10n="NEW">Object is selected</paragraph>
 </tablecell>
-<<<<<<< .working
 <tablecell>
 <paragraph role="tablecontent" id="par_idN106CB" xml-lang="en-US" l10n="NEW">Copies the object formatting that is defined in the Format - Graphics or Format - Drawing Object dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied.</paragraph>
-=======
-<tablecell>
-<paragraph role="tablecontent" id="par_idN106CB" xml-lang="en-US" l10n="NEW">Copies the object formatting that is defined in the Format - Graphics or Format - Object dialogs. The contents, size, position, hyperlinks, and macros in the object are not copied.</paragraph>
->>>>>>> .merge-right.r265757
 </tablecell>
 </tablerow>
 <tablerow>
diff --git a/helpcontent2/source/text/swriter/00/00000405.xhp b/helpcontent2/source/text/swriter/00/00000405.xhp
index 46708e8126..e44c305839 100644
--- a/helpcontent2/source/text/swriter/00/00000405.xhp
+++ b/helpcontent2/source/text/swriter/00/00000405.xhp
@@ -32,7 +32,6 @@
  *
  ************************************************************************
  -->
- 
 	
 <meta>
 <topic id="textswriter0000000405xml" indexer="exclude">
@@ -117,11 +116,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150557" xml-lang="en-US" l10n="E">
-<<<<<<< .working
 <image id="img_id3149214" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3149214" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
-=======
-<image id="img_id3149214" src="res/commandimagelist/sc_framedialog.png" width="0.566cm" height="0.566cm"><alt id="alt_id3149214" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
->>>>>>> .merge-right.r265757
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -184,7 +179,6 @@
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3148823" xml-lang="en-US" l10n="CHG" oldref="78"><variable id="zelle">Right-click in a table, choose <emph>Cell</emph>
 </variable></paragraph>
-<<<<<<< .working
 <section id="verbindenze">
 <paragraph role="paragraph" id="par_id3154351" xml-lang="en-US" l10n="U" oldref="79">Choose <emph>Table - Merge Cells</emph>
 </paragraph>
@@ -225,8 +219,6 @@
 
 </section>
 </section>
-=======
->>>>>>> .merge-right.r265757
 <paragraph role="paragraph" id="par_id3149617" xml-lang="en-US" l10n="U" oldref="85"><variable id="schtzenze">In the context menu of a cell, choose <emph>Cell - Protect</emph>
 </variable></paragraph>
 <section id="schutzaufhz">
@@ -247,11 +239,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3145222" xml-lang="en-US" l10n="E">
-<<<<<<< .working
 <image id="img_id3145228" src="res/commandimagelist/sc_setoptimalrowheight.png" width="0.2228in" height="0.2228in"><alt id="alt_id3145228" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
-=======
-<image id="img_id3145228" src="res/commandimagelist/sc_setoptimalrowheight.png" width="0.423cm" height="0.423cm"><alt id="alt_id3145228" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
->>>>>>> .merge-right.r265757
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -262,7 +250,6 @@
 
 </section>
 </section>
-<<<<<<< .working
 <section id="verteilenzeile">
 <paragraph role="paragraph" id="par_id3153569" xml-lang="en-US" l10n="U" oldref="92">Choose <emph>Table - Autofit - Distribute Rows Equally</emph>
 </paragraph>
@@ -283,8 +270,6 @@
 
 </section>
 </section>
-=======
->>>>>>> .merge-right.r265757
 <paragraph role="paragraph" id="par_id3145095" xml-lang="en-US" l10n="U" oldref="95"><variable id="selektierenz">Choose <emph>Table - Select - Row</emph>
 </variable></paragraph>
 <section id="loschenz">
@@ -296,11 +281,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3147555" xml-lang="en-US" l10n="E">
-<<<<<<< .working
 <image id="img_id3150361" src="res/commandimagelist/sc_deleterows.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150361" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
-=======
-<image id="img_id3150361" src="res/commandimagelist/sc_deleterows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150361" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
->>>>>>> .merge-right.r265757
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -325,11 +306,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3157881" xml-lang="en-US" l10n="E">
-<<<<<<< .working
 <image id="img_id3157888" src="res/commandimagelist/sc_setoptimalcolumnwidthdirect.png" width="0.2228in" height="0.2228in"><alt id="alt_id3157888" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
-=======
-<image id="img_id3157888" src="res/commandimagelist/sc_setoptimalcolumnwidthdirect.png" width="0.423cm" height="0.423cm"><alt id="alt_id3157888" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
->>>>>>> .merge-right.r265757
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -340,7 +317,6 @@
 
 </section>
 </section>
-<<<<<<< .working
 <section id="verteilenspalte">
 <paragraph role="paragraph" id="par_id3159219" xml-lang="en-US" l10n="U" oldref="107">Choose <emph>Table - Autofit - Distribute Columns Equally</emph>
 </paragraph>
@@ -361,8 +337,6 @@
 
 </section>
 </section>
-=======
->>>>>>> .merge-right.r265757
 <paragraph role="paragraph" id="par_id3153172" xml-lang="en-US" l10n="U" oldref="110"><variable id="spaltesel">Choose <emph>Table - Select - Column</emph>
 </variable></paragraph>
 <section id="einfgens">
@@ -375,11 +349,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150279" xml-lang="en-US" l10n="E">
-<<<<<<< .working
 <image id="img_id3150286" src="res/commandimagelist/sc_insertcolumns.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150286" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
-=======
-<image id="img_id3150286" src="res/commandimagelist/sc_insertcolumns.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150286" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
->>>>>>> .merge-right.r265757
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -389,11 +359,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3150895" xml-lang="en-US" l10n="E">
-<<<<<<< .working
 <image id="img_id3150902" src="res/commandimagelist/sc_insertrows.png" width="0.2228in" height="0.2228in"><alt id="alt_id3150902" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
-=======
-<image id="img_id3150902" src="res/commandimagelist/sc_insertrows.png" width="0.423cm" height="0.423cm"><alt id="alt_id3150902" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
->>>>>>> .merge-right.r265757
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -412,11 +378,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3153600" xml-lang="en-US" l10n="E">
-<<<<<<< .working
 <image id="img_id3153607" src="res/commandimagelist/sc_deletecolumns.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153607" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
-=======
-<image id="img_id3153607" src="res/commandimagelist/sc_deletecolumns.png" width="0.566cm" height="0.566cm"><alt id="alt_id3153607" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
->>>>>>> .merge-right.r265757
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -435,11 +397,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3151276" xml-lang="en-US" l10n="E">
-<<<<<<< .working
 <image id="img_id3151283" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3151283" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
-=======
-<image id="img_id3151283" src="res/commandimagelist/sc_framedialog.png" width="0.566cm" height="0.566cm"><alt id="alt_id3151283" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
->>>>>>> .merge-right.r265757
 	</image></paragraph>
 </tablecell>
 <tablecell>
@@ -455,11 +413,7 @@
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id3152973" xml-lang="en-US" l10n="E">
-<<<<<<< .working
 <image id="img_id3152980" src="res/commandimagelist/sc_framedialog.png" width="0.2228in" height="0.2228in"><alt id="alt_id3152980" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
-=======
-<image id="img_id3152980" src="res/commandimagelist/sc_framedialog.png" width="0.566cm" height="0.566cm"><alt id="alt_id3152980" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
->>>>>>> .merge-right.r265757
 	</image></paragraph>
 </tablecell>
 <tablecell>
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>
-- 
cgit