http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9351 Pierre Angot <tredok.pierre@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |tredok.pierre@gmail.com --- Comment #11 from Pierre Angot <tredok.pierre@gmail.com> --- Sandbox setup by tredok.pierre@gmail.com with database 2 and bug 9351 on Thu Jun 6 08:43:00 2013 Something went wrong ! Applying: Bug 9351 - item type not recorded correctly in statistics for returns and some local use Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Circulation.pm CONFLICT (content): Merge conflict in C4/Circulation.pm Failed to merge in the changes. Patch failed at 0001 Bug 9351 - item type not recorded correctly in statistics for returns and some local use When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Bug 9351 - item type not recorded correctly in statistics for returns and some local use Proposed patch (revised) Apply? [yn] Patch left in /tmp/Proposed-patch-revised-jhptam.patch -- You are receiving this mail because: You are watching all bug changes.