From abbc9062efffd4b124ce23edda8a62ac42e82d0d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 27 Jun 2019 13:54:31 +0200
Subject: [PATCH] Merge

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c1333ab3276..82eff9e0d67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -315,7 +315,6 @@ FIX: condition
 FIX: confirmation of mass email sending + option MAILING_NO_USING_PHPMAIL
 FIX: crabe pdf: bad detailed VAT for situation invoices, in situations S2 and above
 FIX: default value for duration of validity can be set from generic
-FIX: do not include disabled modules tpl
 FIX: do not include tpl from disabled modules
 FIX: Error management when MAILING_NO_USING_PHPMAIL is set
 FIX: Even with permission, can't validate leave once validator defined.