http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12933
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #53 from Katrin Fischer <[email protected]> --- Sorry, patch doesn't apply, please rebase: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 12933 - Add ability to print overdue slip from staff intranet Using index info to reconstruct a base tree... M C4/Overdues.pm Falling back to patching base and 3-way merge... Auto-merging C4/Overdues.pm CONFLICT (content): Merge conflict in C4/Overdues.pm Failed to merge in the changes. Patch failed at 0001 Bug 12933 - Add ability to print overdue slip from staff intranet The copy of the patch that failed is found in: /home/katrin/kohaclone/.git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-12933---Add-ability-to-print-overdue-slip-from-IujNUN.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
