fix(conflict): fix merge conflict in install

08660f5f · Kevin Duret · 2e61ff0c · 08660f5f
Commit 08660f5f authored Feb 28, 2018 by Kevin Duret
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

www/install/insertBaseConf.sql www/install/insertBaseConf.sql +0 -4

No files found.
--- a/www/install/insertBaseConf.sql
+++ b/www/install/insertBaseConf.sql
@@ -2,11 +2,7 @@
 -- Insert version
 --

-<<<<<<< HEAD
 INSERT INTO `informations` (`key` ,`value`) VALUES ('version', '2.9.0');
-=======
-INSERT INTO `informations` (`key` ,`value`) VALUES ('version', '2.8.19');
->>>>>>> 4338ffa68... fix(perf): fix centreon_acl index creation on update (#6093)

 --
 -- Contenu de la table `contact`