| commit | 8242a54b4967ee986b21c1579a42b4284ac73967 | [log] [tgz] |
|---|---|---|
| author | emmanuel lecharny <emmanuel.lecharny@busit.com> | Wed Nov 13 23:52:11 2019 +0100 |
| committer | emmanuel lecharny <emmanuel.lecharny@busit.com> | Wed Nov 13 23:52:11 2019 +0100 |
| tree | acef1542b790f4d99d49923b82ccda82ea8e6688 | |
| parent | 4d8bc0352dfae6c2c6850a5a9f31741b69fd34bb [diff] |
Removed a merge trace
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 @@ /** -<<<<<<< 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> */