From 7bf1bb9ffac0a20ccd45040097cae02ee1ec8e4a Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Thu, 13 May 2021 21:38:25 +0200 Subject: [PATCH] fix merge conflict leftover in changelog --- CHANGELOG.TXT | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 3025b71d..4ae7ef69 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -31,7 +31,6 @@ Version 3.3.9 - 2021/05/12 - Add domain_admins.id pk column for non-sqlite users, see: https://github.com/postfixadmin/postfixadmin/issues/475 - Add fix for MySQL error where a default datetime value in the domain field breaks the upgrade.php db schema update, see https://github.com/postfixadmin/postfixadmin/issues/489 - Bug fix quota levels (now user configurable again; thanks @csware, see https://github.com/postfixadmin/postfixadmin/commit/bfc7af5c8efe2a68c47286cc870b56cb4f929a3f ->>>>>>> postfixadmin_3.3 Version 3.3.8 - 2021/03/04 -------------------------------------------------