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 2019/11/13 22:52:20 UTC
[directory-server] 02/02: Removed a merge trace
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 8242a54b4967ee986b21c1579a42b4284ac73967
Author: emmanuel lecharny <em...@busit.com>
AuthorDate: Wed Nov 13 23:52:11 2019 +0100
Removed a merge trace
---
.../server/operations/extended/PwdModifyNoPPNoPasswordHashingIT.java | 4 ----
1 file changed, 4 deletions(-)
diff --git a/server-integ/src/test/java/org/apache/directory/server/operations/extended/PwdModifyNoPPNoPasswordHashingIT.java b/server-integ/src/test/java/org/apache/directory/server/operations/extended/PwdModifyNoPPNoPasswordHashingIT.java
index 4e6ea1c..a413c4a 100644
--- a/server-integ/src/test/java/org/apache/directory/server/operations/extended/PwdModifyNoPPNoPasswordHashingIT.java
+++ b/server-integ/src/test/java/org/apache/directory/server/operations/extended/PwdModifyNoPPNoPasswordHashingIT.java
@@ -57,12 +57,8 @@ import org.junit.runner.RunWith;
/**
-<<<<<<< HEAD
- * Test the PwdModify extended operation
-=======
* Test the PwdModify extended operation, when no PasswordPolicy or PasswordHashing interceptor
* are present.
->>>>>>> c42030f59692518133715f0a4753ce24bb63b2d8
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/