https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25690
--- Comment #36 from Joonas Kylmälä <joonas.kylm...@helsinki.fi> --- Kyle, btw, you had set the bug to "Doesn't apply status". For me it applied but I noticed: > Using index info to reconstruct a base tree... > M C4/SIP/ILS/Transaction/Checkout.pm > Falling back to patching base and 3-way merge... > Auto-merging C4/SIP/ILS/Transaction/Checkout.pm in the git messages, so maybe it depends on git settings. I attached all the patches now again, so hopefully it works for you now as well. -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/
