https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=24172
Magnus Enger <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #40 from Magnus Enger <[email protected]> --- Sorry. $ git bz apply 24172 Bug 24172 - Locale is ignored when saving season name in the database 139809 - Bug 24172: Allow translation of seasons in serials-edit.tt and subscription-detail.tt Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 24172: Allow translation of seasons in serials-edit.tt and subscription-detail.tt Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt M koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt M koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt M koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 24172: Allow translation of seasons in serials-edit.tt and subscription-detail.tt hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-24172-Allow-translation-of-seasons-in-serials--YDHoY1.patch -- 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/
