[exim-cvs] Fix mismerge

Page principale
Supprimer ce message
Répondre à ce message
Auteur: Exim Git Commits Mailing List
Date:  
À: exim-cvs
Sujet: [exim-cvs] Fix mismerge
Gitweb: https://git.exim.org/exim.git/commitdiff/e2725fc0da9c39d279a883cbd184cf3243026dd3
Commit:     e2725fc0da9c39d279a883cbd184cf3243026dd3
Parent:     070be8703609e75197c760a5696358360ead1f85
Author:     Andrew Aitchison <exim@???>
AuthorDate: Fri Nov 29 20:35:25 2024 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Fri Nov 29 20:35:51 2024 +0000


    Fix mismerge
---
 src/src/globals.c | 1 -
 1 file changed, 1 deletion(-)


diff --git a/src/src/globals.c b/src/src/globals.c
index f0d6027f3..8373c1e7d 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -519,7 +519,6 @@ uschar *acl_wherecodes[]       = { [ACL_WHERE_RCPT] =    US"550",
                                    [ACL_WHERE_ATRN] =    US"450",
                                    [ACL_WHERE_AUTH] =    US"503",
                                    [ACL_WHERE_CONNECT] = US"550",
-                                   [ACL_WHERE_ATRN] =    US"450",
                                    [ACL_WHERE_ETRN] =    US"458",
                                    [ACL_WHERE_EXPN] =    US"550",
                                    [ACL_WHERE_HELO] =    US"550",


--
## subscription configuration (requires account):
## https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/