http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5336
mathieu saby <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #23 from mathieu saby <[email protected]> --- I applied the 2 patchs, but bz5336 does not apply: CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt CONFLICT (content): Merge conflict in acqui/histsearch.pl I reverted bz7294, and tried to apply only 5336, but I got the same errors. Could you rebase it please? M. Saby -- 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/
