From c3360c4c304e3f092bb34f17f17bed3352065eab Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 12 Jan 2014 14:51:54 +0100 Subject: [PATCH] Fix: Bad merge --- ChangeLog | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e76e259c9b6..27ce4abbbcf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,9 +22,10 @@ For developers: - New: Add path file of trigger into admin trigger list page. - New: More phpunit tests. - New: Payments and supplier payment pages tabs can now be extended from modules. -<<<<<<< HEAD - New: Add option 'aZ' into GETPOST function to check parameters contains only a to z or A to Z characters. +- New: Opensurvey polls tab cards can now be extended from external modules. +- New: Triggers OPENSURVEY_CREATE, OPENSURVEY_DELETE WARNING: Following change may create regression for some external modules, but was necessary to make Dolibarr better: @@ -32,10 +33,6 @@ Dolibarr better: - The deprecated way (with 4 parameters) to declare a new tab into a module descriptor file has been removed. You must now use the 6 parameters way. See file modMyModule.class.php for example. -======= -- New: Opensurvey polls tab cards can now be extended from external modules. -- New: Triggers OPENSURVEY_CREATE, OPENSURVEY_DELETE ->>>>>>> 2313ea01dda16f3dc73c718bee2bf1c38291fa49 ***** ChangeLog for 3.5 compared to 3.4.* ***** For users: