http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8007
M. Tompsett <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #20 from M. Tompsett <[email protected]> --- I don't think it applies cleanly. mtompset@ubuntu:~/kohaclone2$ git bz apply 8007 Bug 8007 - Discharge management 17484 - Bug 8007: Discharge management 17485 - Bug 8007: Add a discharges example file Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 8007: Discharge management Using index info to reconstruct a base tree... <stdin>:587: new blank line at EOF. + warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging misc/cronjobs/gather_print_notices.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc Auto-merging installer/data/mysql/updatedatabase.pl Auto-merging installer/data/mysql/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql Auto-merging installer/data/mysql/de-DE/mandatory/sample_notices.sql Auto-merging C4/Members.pm Auto-merging C4/Letters.pm Auto-merging C4/Auth.pm CONFLICT (content): Merge conflict in C4/Auth.pm Failed to merge in the changes. Patch failed at 0001 Bug 8007: Discharge management 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-8007-Discharge-management-8LjEoI.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/
