https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22630
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #46 from Katrin Fischer <[email protected]> --- I'd love for this to move now we got 23727 fixed, but sadly this no longer applies :( Could we get a rebase please? CONFLICT (content): Merge conflict in t/db_dependent/CourseReserves/CourseItems.t Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt Auto-merging installer/data/mysql/kohastructure.sql CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql Auto-merging course_reserves/add_items.pl CONFLICT (content): Merge conflict in course_reserves/add_items.pl Auto-merging C4/CourseReserves.pm -- 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/
