[icinga-checkins] icinga.org: icinga-doc/master: fix rebase leftover

git at icinga.org git at icinga.org
Mon May 6 22:16:20 CEST 2013


Module: icinga-doc
Branch: master
Commit: 6f092b00bc5f032ab465ea6c1a2b52ef43306c8f
URL:    https://git.icinga.org/?p=icinga-doc.git;a=commit;h=6f092b00bc5f032ab465ea6c1a2b52ef43306c8f

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Wed Apr 10 21:13:00 2013 +0200

fix rebase leftover

---

 en/upgrading_idoutils.xml |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/en/upgrading_idoutils.xml b/en/upgrading_idoutils.xml
index 49c4862..a916b27 100644
--- a/en/upgrading_idoutils.xml
+++ b/en/upgrading_idoutils.xml
@@ -223,11 +223,7 @@
   </section>
 
   <section xml:id="upgrade1.0.3">
-<<<<<<< HEAD
     <title>Upgrading &name-idoutils; to 1.0.3</title>
-=======
-    <title>>Upgrading &name-idoutils; to 1.0.3</title>
->>>>>>> docs issue #3835: enable_sla and tackle cronk are deprecated since 1.9
 
     <para>There were some few minor changes:</para>
 





More information about the icinga-checkins mailing list