http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8587
Koha Team Lyon 3 <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #18 from Koha Team Lyon 3 <[email protected]> --- The sandbox you've requested is not ready. Some problems occurred applying patches from bug 8587: <h1>Something went wrong !</h1>Applying: Bug 8587 - Add a serial lifespan field to serial subscriptions Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Serials.pm CONFLICT (content): Merge conflict in C4/Serials.pm Auto-merging installer/data/mysql/kohastructure.sql CONFLICT (content): Merge conflict in installer/data/mysql/kohastructure.sql Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt Auto-merging serials/subscription-add.pl CONFLICT (content): Merge conflict in serials/subscription-add.pl Auto-merging serials/subscription-detail.pl Failed to merge in the changes. Patch failed at 0001 Bug 8587 - Add a serial lifespan field to serial subscriptions 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. Bug 8587 - Add a serial lifespan to serial subscriptions 19415 - Bug 8587 - Add a serial lifespan field to serial subscriptions 19416 - Bug 8587 - Add a serial lifespan to serial subscriptions - Followup - Change seriallifespan to serial_lifespan for readability Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-8587---Add-a-serial-lifespan-field-to-serial-s-TRyUC2.patch . -- 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/
