https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5620
Alex Buckley <alexbuck...@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #32 from Alex Buckley <alexbuck...@catalyst.net.nz> --- Hi David Testing this patch again it fails to apply for me, the issue is in members/paycollect.pl, can you please rebase against master and then I will be happy to retest: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 5620 - Rebase and add Paypal to staff interface /home/vagrant/kohaclone/.git/rebase-apply/patch:155: trailing whitespace. Koha::Account->new( { patron_id => $borrowernumber } )->pay( /home/vagrant/kohaclone/.git/rebase-apply/patch:156: trailing whitespace. { /home/vagrant/kohaclone/.git/rebase-apply/patch:157: trailing whitespace. amount => $total_paid, /home/vagrant/kohaclone/.git/rebase-apply/patch:160: trailing whitespace. } warning: 4 lines add whitespace errors. Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt M members/paycollect.pl <stdin>:155: trailing whitespace. Koha::Account->new( { patron_id => $borrowernumber } )->pay( <stdin>:156: trailing whitespace. { <stdin>:157: trailing whitespace. amount => $total_paid, <stdin>:160: trailing whitespace. } warning: 4 lines applied after fixing whitespace errors. Falling back to patching base and 3-way merge... Auto-merging members/paycollect.pl CONFLICT (content): Merge conflict in members/paycollect.pl Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt Failed to merge in the changes. Patch failed at 0001 Bug 5620 - Rebase and add Paypal to staff interface The copy of the patch that failed is found in: /home/vagrant/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-5620---Rebase-and-add-Paypal-to-staff-interfac-SeWTyY.patch -- You are receiving this mail because: You are the QA Contact for the bug. 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/