Hi Frederico, seems you have touched that ldap lib file, but unless you have something you need in there you can simply reset in like this:
git checkout lib/gitorious/authentication/ldap_authentication.rb and proceed with the merge. :) cheers, Thomas On Thursday, January 17, 2013 at 12:16 AM, Federico Don wrote: > lib/gitorious/authentication/ldap_authentication.rb -- To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected]
