http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11373
Nicole C. Engard <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Failed QA --- Comment #10 from Nicole C. Engard <[email protected]> --- Am I supposed to apply to all these patches? I got the following: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 11373: Add a "cash register" feature to the fine payment form. /home/nengard/kohaclone/.git/rebase-apply/patch:242: trailing whitespace. $template->param( /home/nengard/kohaclone/.git/rebase-apply/patch:247: trailing whitespace. $template->param( warning: 2 lines add whitespace errors. Using index info to reconstruct a base tree... <stdin>:242: trailing whitespace. $template->param( <stdin>:247: trailing whitespace. $template->param( warning: 2 lines applied after fixing whitespace errors. Falling back to patching base and 3-way merge... Auto-merging members/paycollect.pl Auto-merging C4/Accounts.pm CONFLICT (content): Merge conflict in C4/Accounts.pm Failed to merge in the changes. Patch failed at 0001 Bug 11373: Add a "cash register" feature to the fine payment form. 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-11373-Add-a-cash-register-feature-to-the-fine--I0lypc.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/
