From 6af968a5d7451319d1242fd5a5b7fd3c0beff8db Mon Sep 17 00:00:00 2001
From: Guillaume28 <gbaldo@centreon.com>
Date: Mon, 5 Mar 2018 14:29:07 +0100
Subject: [PATCH] fix(Conflict): Header conflict
---
doc/en/release_notes/centreon-2.8/centreon-2.8.8.rst | 4 +---
doc/en/release_notes/centreon-2.8/index.rst | 3 ---
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/doc/en/release_notes/centreon-2.8/centreon-2.8.8.rst b/doc/en/release_notes/centreon-2.8/centreon-2.8.8.rst
index baab93660b..7c8cdede3d 100644
--- a/doc/en/release_notes/centreon-2.8/centreon-2.8.8.rst
+++ b/doc/en/release_notes/centreon-2.8/centreon-2.8.8.rst
@@ -7,7 +7,5 @@ Bug Fixes
* Fix Centreon Engine configuration form
* Fix custom view sharing
-<<<<<<< HEAD
* Fix Knowledge Base script compatibility with PHP < 5.4
-=======
->>>>>>> a9015123a... Prepare 2.8.8 release.
+
diff --git a/doc/en/release_notes/centreon-2.8/index.rst b/doc/en/release_notes/centreon-2.8/index.rst
index 48d1548335..3c75036eda 100644
--- a/doc/en/release_notes/centreon-2.8/index.rst
+++ b/doc/en/release_notes/centreon-2.8/index.rst
@@ -15,7 +15,6 @@ Please find here the release notes dedicated to the last 2.8.x version of Centre
centreon-2.8.6
centreon-2.8.7
centreon-2.8.8
-<<<<<<< HEAD
centreon-2.8.9
centreon-2.8.10
centreon-2.8.11
@@ -27,5 +26,3 @@ Please find here the release notes dedicated to the last 2.8.x version of Centre
centreon-2.8.17
centreon-2.8.18
centreon-2.8.19
-=======
->>>>>>> a9015123a... Prepare 2.8.8 release.
--
GitLab