https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12461 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #38 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I am sorry, there are too many conflicts for me to feel comfortable trying to fix: CONFLICT (content): Merge conflict in opac/opac-user.pl Auto-merging members/moremember.pl Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt Auto-merging installer/data/mysql/kohastructure.sql CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql Auto-merging circ/circulation.pl CONFLICT (content): Merge conflict in circ/circulation.pl Auto-merging Koha/Schema/Result/Borrower.pm Auto-merging Koha/Patron.pm CONFLICT (content): Merge conflict in Koha/Patron.pm Please take a look! -- You are receiving this mail because: You are watching all bug changes.