summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/shared/00/00000402.xhp
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/source/text/shared/00/00000402.xhp')
-rw-r--r--helpcontent2/source/text/shared/00/00000402.xhp5
1 files changed, 0 insertions, 5 deletions
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.
*