#i10000# remove merge markers in help files

1 files changed, 0 insertions, 46 deletions

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>