http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10842 I'm just a bot <gitbot@bugs.koha-community.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply When did the bot|2013-09-24 00:00:00 |2013-10-25 last check this| | --- Comment #5 from I'm just a bot <gitbot@bugs.koha-community.org> --- Applying: Bug 10842: Fixed bug in Auth_with_ldap Using index info to reconstruct a base tree... M C4/Auth_with_ldap.pm Falling back to patching base and 3-way merge... Auto-merging C4/Auth_with_ldap.pm CONFLICT (content): Merge conflict in C4/Auth_with_ldap.pm Patch failed at 0001 Bug 10842: Fixed bug in Auth_with_ldap The copy of the patch that failed is found in: /home/christopher/git/koha/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". -- You are receiving this mail because: You are watching all bug changes.