[icinga-checkins] icinga.org: icinga-doc/lberdelsmann/doc_de: Fix previous conflicts in en. xsl

git at icinga.org git at icinga.org
Sun Oct 11 23:30:28 CEST 2009


Module: icinga-doc
Branch: lberdelsmann/doc_de
Commit: f7b6e3e42596820a58d825b3e1bbdafdaea45f6e
URL:    https://git.icinga.org/?p=icinga-doc.git;a=commit;h=f7b6e3e42596820a58d825b3e1bbdafdaea45f6e

Author: Hendrik Baecker <andurin at process-zero.de>
Date:   Sat Oct  3 22:59:06 2009 +0200

Fix previous conflicts in en.xsl

---

 xsl/common/en.xml |   42 ------------------------------------------
 1 files changed, 0 insertions(+), 42 deletions(-)

diff --git a/xsl/common/en.xml b/xsl/common/en.xml
index 3cefeb7..b242974 100644
--- a/xsl/common/en.xml
+++ b/xsl/common/en.xml
@@ -435,23 +435,6 @@
 <l:template name="docnamelong" text=" in the document titled %o"/>
 <l:template name="pageabbrev" text="(p. %p)"/>
 <l:template name="Page" text="Page %p"/>
-<<<<<<< HEAD:xsl/common/en.xml
-<<<<<<< HEAD:xsl/common/en.xml
-<l:template name="bridgehead" text="the section called “%t”"/>
-<l:template name="refsection" text="the section called “%t”"/>
-<l:template name="refsect1" text="the section called “%t”"/>
-<l:template name="refsect2" text="the section called “%t”"/>
-<l:template name="refsect3" text="the section called “%t”"/>
-<l:template name="sect1" text="the section called “%t”"/>
-<l:template name="sect2" text="the section called “%t”"/>
-<l:template name="sect3" text="the section called “%t”"/>
-<l:template name="sect4" text="the section called “%t”"/>
-<l:template name="sect5" text="the section called “%t”"/>
-<l:template name="section" text="the section called “%t”"/>
-<l:template name="simplesect" text="the section called “%t”"/>
-=======
-=======
->>>>>>> origin/hbaecker/maybebetter:xsl/common/en.xml
 <l:template name="bridgehead" text="“%t”"/>
 <l:template name="refsection" text="“%t”"/>
 <l:template name="refsect1" text="“%t”"/>
@@ -464,10 +447,6 @@
 <l:template name="sect5" text="“%t”"/>
 <l:template name="section" text="“%t”"/>
 <l:template name="simplesect" text="“%t”"/>
-<<<<<<< HEAD:xsl/common/en.xml
->>>>>>> 5a98431... re-add section format macro in stylesheet:xsl/common/en.xml
-=======
->>>>>>> origin/hbaecker/maybebetter:xsl/common/en.xml
 </l:context>
 <l:context name="xref-number"><l:template name="answer" text="A: %n"/>
 <l:template name="appendix" text="Appendix %n"/>
@@ -500,38 +479,17 @@
 <l:template name="procedure" text="Procedure %n, “%t”"/>
 <l:template name="productionset" text="Production %n, “%t”"/>
 <l:template name="qandadiv" text="Q & A %n, “%t”"/>
-<<<<<<< HEAD:xsl/common/en.xml
-<<<<<<< HEAD:xsl/common/en.xml
-<l:template name="refsect1" text="the section called “%t”"/>
-<l:template name="refsect2" text="the section called “%t”"/>
-<l:template name="refsect3" text="the section called “%t”"/>
-<l:template name="refsection" text="the section called “%t”"/>
-=======
-=======
->>>>>>> origin/hbaecker/maybebetter:xsl/common/en.xml
 <l:template name="refsect1" text="“%t”"/>
 <l:template name="refsect2" text="“%t”"/>
 <l:template name="refsect3" text="“%t”"/>
 <l:template name="refsection" text="“%t”"/>
-<<<<<<< HEAD:xsl/common/en.xml
->>>>>>> 5a98431... re-add section format macro in stylesheet:xsl/common/en.xml
-=======
->>>>>>> origin/hbaecker/maybebetter:xsl/common/en.xml
 <l:template name="sect1" text="Section %n, “%t”"/>
 <l:template name="sect2" text="Section %n, “%t”"/>
 <l:template name="sect3" text="Section %n, “%t”"/>
 <l:template name="sect4" text="Section %n, “%t”"/>
 <l:template name="sect5" text="Section %n, “%t”"/>
 <l:template name="section" text="Section %n, “%t”"/>
-<<<<<<< HEAD:xsl/common/en.xml
-<<<<<<< HEAD:xsl/common/en.xml
-<l:template name="simplesect" text="the section called “%t”"/>
-=======
 <l:template name="simplesect" text="“%t”"/>
->>>>>>> 5a98431... re-add section format macro in stylesheet:xsl/common/en.xml
-=======
-<l:template name="simplesect" text="“%t”"/>
->>>>>>> origin/hbaecker/maybebetter:xsl/common/en.xml
 <l:template name="table" text="Table %n, “%t”"/>
 </l:context>
 <l:context name="authorgroup"><l:template name="sep" text=", "/>





More information about the icinga-checkins mailing list