Closed neurons closed 9 years ago
Merge conflict fixed. New pull request: https://github.com/yammer/dropwizard-auth-ldap/pull/4
Created a new PR through my recommendation - Unresolved conflict tags were going to make things really messy so we cherry-picked what we needed into a new branch and fixed everything from there. :)
Thanks to @Pshaw125 for the help!
Changes: