Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

ac
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

9385e1e6

Commit 9385e1e6 authored 9 years ago by Patrick Dowler

Downloads
- Plain Diff

fix conflicts in deleteUser

parents 931f1c82 6ce93e33

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

projects/cadcAccessControl-Server/build.xml 1 addition, 1 deletion

projects/cadcAccessControl-Server/build.xml
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java 10 additions, 3 deletions

...ol-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java 13 additions, 0 deletions

.../test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java

with 24 additions and 4 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment