https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17248
--- Comment #4 from Jonathan Druart <[email protected]> --- (In reply to Claire Gravely from comment #3) > could not apply bug 17216 (depends on) > CONFLICT (content): Merge conflict in > koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt > Failed to merge in the changes. Rebased. -- 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/
