https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14974 Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |bgkriegel@gmail.com Status|Needs Signoff |Patch doesn't apply --- Comment #11 from Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> --- Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt Auto-merging api/v1/swagger.json Failed to merge in the changes -- You are receiving this mail because: You are watching all bug changes.