http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6413
--- Comment #13 from Chris Cormack <[email protected]> --- Did you remember to try applying it with a 3 way merge git bz is cool, but without the patch from paul, it doesnt try to merge. git am --abort git am -iu3 /tmp/Added-ability-to-add-notes-when-paying-or-writing--E9jlEe.patch Found out it was a tiny conflict because of the capitalisation change, in one file. Fixed that, reattached. But if git bz fails, please try git am -iu3 before marking does not apply, if that still fails, then that's fine. But a lot of the times it passes -- You are receiving this mail because: You are the QA Contact for the bug. 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/
