https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22544
--- Comment #170 from Katrin Fischer <katrin.fisc...@bsz-bw.de> --- Can we please have a rebase? Apply? [(y)es, (n)o, (i)nteractive] < Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 22544: Move get_opac_new to Koha namespace Applying: Bug 22544: Move get_opac_news to Koha namespace Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt -- 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/
