http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8868
Koha Team AMU <koha.aixmarsei...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
CC| |koha.aixmarsei...@gmail.com
--- Comment #2 from Koha Team AMU <koha.aixmarsei...@gmail.com> ---
Tried on a sandbox. Not possible :
Something went wrong !
Applying: Bug 8868: ILS-DI: CancelHold needs to take a reserve_id
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging C4/ILSDI/Services.pm
CONFLICT (content): Merge conflict in C4/ILSDI/Services.pm
Auto-merging C4/Reserves.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 8868: ILS-DI: CancelHold needs to take a reserve_id
When you have resolved this problem run "git am --resolved".
--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
