https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20629
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff --- Comment #4 from Katrin Fischer <[email protected]> --- Patch doesn't apply - can you please rebase? CONFLICT (content): Merge conflict in members/printfeercpt.pl Auto-merging members/boraccount.pl CONFLICT (content): Merge conflict in members/boraccount.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt Auto-merging Koha/Account/Line.pm CONFLICT (content): Merge conflict in Koha/Account/Line.pm -- 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/
