From: Michael Friedrich <michael.friedrich@netways.de>
Date: Mon, 2 Jun 2014 11:20:58 +0000 (+0200)
Subject: Documentation: Drop merge leftover.
X-Git-Tag: v2.0.0-beta2~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc446bb8b54d720a1a0fb8a4cd18aff5782700b0;p=icinga2

Documentation: Drop merge leftover.

Refs #5795
---

diff --git a/doc/8-migration.md b/doc/8-migration.md
index eee801344..b7cc3b199 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
-possible.
->>>>>>> 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