Google GitGoogle Git
Sign in
apache/directory-server/0407383dff2264c85ece3a5a836c63f50f0979cb
commit
0407383dff2264c85ece3a5a836c63f50f0979cb
[log]
author
emmanuel lecharny <elecharny@apache.org>
Fri Jan 17 10:10:02 2025 +0100
committer
emmanuel lecharny <elecharny@apache.org>
Fri Jan 17 10:10:02 2025 +0100
tree
7982fcd6830da0fe5649d43e175aebe86b722826
parent
22bb28ab4923e4567cf1d6452cf3f86ad4fef284 [diff]
Fix conflicts
1 file changed
tree: 7982fcd6830da0fe5649d43e175aebe86b722826
  1. .github/
  2. .mvn/
  3. all/
  4. bulkloader/
  5. core/
  6. core-annotations/
  7. core-api/
  8. core-avl/
  9. core-constants/
  10. core-integ/
  11. core-jndi/
  12. core-shared/
  13. http-directory-bridge/
  14. http-integration/
  15. i18n/
  16. installers/
  17. installers-maven-plugin/
  18. interceptor-kerberos/
  19. interceptors/
  20. jdbm-partition/
  21. kerberos-codec/
  22. ldap-client-test/
  23. ldif-partition/
  24. lmdb-partation/
  25. mavibot-partition/
  26. mavibotv2-partition/
  27. mmr-tests/
  28. osgi/
  29. osgi-integ/
  30. protocol-dhcp/
  31. protocol-dns/
  32. protocol-ldap/
  33. protocol-ntp/
  34. protocol-shared/
  35. resources/
  36. server-annotations/
  37. server-config/
  38. server-integ/
  39. server-jndi/
  40. service/
  41. service-builder/
  42. src/
  43. syncrepl/
  44. test-framework/
  45. wrapper/
  46. xdbm-partition/
  47. .gitignore
  48. doap_apacheds.rdf
  49. Jenkinsfile
  50. LICENSE
  51. mvnw
  52. mvnw.cmd
  53. NOTICE
  54. pom.xml
  55. README.md