From 4a694cfed533599f1bbc463699be51c8a7451072 Mon Sep 17 00:00:00 2001
From: Kevin Duret <kduret@centreon.com>
Date: Thu, 12 Apr 2018 17:42:16 +0200
Subject: [PATCH] fix(conflict): remove conflict git log
---
.../configuration/configObject/contact/formContact.php | 5 -----
1 file changed, 5 deletions(-)
diff --git a/www/include/configuration/configObject/contact/formContact.php b/www/include/configuration/configObject/contact/formContact.php
index bfe1d15ed5..9b6fd9e2f7 100644
--- a/www/include/configuration/configObject/contact/formContact.php
+++ b/www/include/configuration/configObject/contact/formContact.php
@@ -793,9 +793,4 @@ if ($valid) {
document.getElementById('sNone').checked = false;
}
}
-<<<<<<< HEAD
</script>
-=======
-}
-</script>
->>>>>>> 1c456741a... feat(api): Split role between configuration and realtime
--
GitLab