https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=41585
Laura Escamilla <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |Laura.escamilla@bywatersolu | |tions.com Status|Signed Off |Failed QA --- Comment #4 from Laura Escamilla <[email protected]> --- Hi Martin, I'm seeing some merge issues when trying to apply the bug. CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 41585: Fix cash refund payouts not appearing in register transactions hint: Use 'git am --show-current-patch=diff' to see the failed 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-41585-Fix-cash-refund-payouts-not-appearing-in-fmt2pg4p.patch Could you please rebase and then I would be happy to continue QAing it! Thank you! -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
