[icinga-checkins] icinga.org: icinga2/next: Documentation: Drop merge leftover.

git at icinga.org git at icinga.org
Mon Jun 2 13:21:19 CEST 2014

Module: icinga2
Branch: next
Commit: bc446bb8b54d720a1a0fb8a4cd18aff5782700b0
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=bc446bb8b54d720a1a0fb8a4cd18aff5782700b0

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Mon Jun  2 13:20:58 2014 +0200

Documentation: Drop merge leftover.

Refs #5795


 doc/8-migration.md |   11 -----------
 1 file changed, 11 deletions(-)

diff --git a/doc/8-migration.md b/doc/8-migration.md
index eee8013..b7cc3b1 100644
--- a/doc/8-migration.md
+++ b/doc/8-migration.md
@@ -12,17 +12,6 @@ In order to migrate existing configurations in Icinga 1.x format,
 the Icinga CLI, as part of the Icinga Web 2 project will provide
 a conversion module.
-Due to the complexity of the Icinga 1.x configuration format, the migration
-script might not currently work for all use cases.
-The migration script tries to preserve your existing template structure and
-adds new templates where appropriate. However, the original file structure is
-not preserved.
-The migration script also uses templates from the Icinga Template Library where
->>>>>>> Fixes for poor grammar and bad sentence structure.:doc/7-migration.md
 ### <a id="manual-config-migration"></a> Manual Config Migration
 For a long-term migration of your configuration you should consider re-creating

More information about the icinga-checkins mailing list