Private GIT

Skip to content
Snippets Groups Projects
Commit 6af968a5 authored by Guillaume28's avatar Guillaume28
Browse files

fix(Conflict): Header conflict

parent ee828537
Branches
No related tags found
No related merge requests found
......@@ -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.
......@@ -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.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment