You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@directory.apache.org by el...@apache.org on 2024/08/22 08:48:11 UTC

(directory-server) 02/02: Fixed merge

This is an automated email from the ASF dual-hosted git repository.

elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git

commit 044ab207e3fb1405efff147c0108ac9ee42c84e0
Merge: 40eee98223 75f8ae8cbb
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Thu Aug 22 10:47:59 2024 +0200

     Fixed merge

 i18n/src/main/java/org/apache/directory/server/i18n/I18n.java | 2 --
 1 file changed, 2 deletions(-)

diff --cc i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
index 337307e6db,32c76f3b04..3ed7ef72c3
--- a/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
+++ b/i18n/src/main/java/org/apache/directory/server/i18n/I18n.java
@@@ -580,8 -574,14 +580,6 @@@ public enum I18
      ERR_249("ERR_249"),
      ERR_475("ERR_475"),
      ERR_476("ERR_476"),
 -    ERR_503("ERR_503"),
 -    ERR_504("ERR_504"),
--    ERR_505("ERR_505"),
--    ERR_506("ERR_506"),
 -    ERR_508("ERR_508"),
 -    ERR_509("ERR_509"),
 -    ERR_510("ERR_510"),
 -    ERR_511("ERR_511"),
      ERR_689("ERR_689"),
      ERR_690("ERR_690"),
      ERR_691("ERR_691"),