From 944dbed98a84ef243d2c4a6a4b76220645a2f49d Mon Sep 17 00:00:00 2001
From: Philippe Caseiro <pcaseiro@cadoles.com>
Date: Tue, 24 Nov 2020 13:27:45 +0100
Subject: [PATCH] Cleanup merge fail

---
 tmpl/lmConf-1.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tmpl/lmConf-1.json b/tmpl/lmConf-1.json
index 408b2a0..1397ff0 100644
--- a/tmpl/lmConf-1.json
+++ b/tmpl/lmConf-1.json
@@ -196,7 +196,6 @@
     "macros": {
         "_whatToTrace": "$_auth eq 'SAML' ? \"$_user\\@$_idpConfKey\" : \"$_user\""
     },
-<<<<<<< HEAD
     "mailCharset": "utf-8",
     "mailConfirmSubject": "[LemonLDAP::NG] Password reset confirmation",
     "mailFrom": "noreply@%%nom_domaine_local",