directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject [directory-server] 02/02: Fixed some merge issue
Date Sun, 12 Aug 2018 09:19:32 GMT
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 caadb1d46cedf00de5ea32ef49d93255a51ad3bc
Merge: 14bbb14 28fd771
Author: Emmanuel L├ęcharny <elecharny@symas.com>
AuthorDate: Sun Aug 12 11:19:24 2018 +0200

    Fixed some merge issue

 .../org/apache/directory/server/core/api/partition/PartitionNexus.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java
index 357b761,9cd82b4..e1ff2ab
--- a/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java
+++ b/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java
@@@ -151,4 -150,4 +151,4 @@@ public interface PartitionNexus extend
       * @throws LdapException If we had an issue during the operation
       */
      boolean compare( CompareOperationContext compareContext ) throws LdapException;
--}
++}


Mime
View raw message