http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10855
Paola Rossi <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #83 from Paola Rossi <[email protected]> --- I apply the patch against master 3.15.00.005. Applying: Bug 10855: New fields on adding/updating a subscription Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt Auto-merging C4/Serials.pm Failed to merge in the changes. Patch failed at 0001 Bug 10855: New fields on adding/updating a subscription When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". After resolving the conflict (in subscription-detail.tt), a new conflict arises applying the following fifth patch. So I pass the patch to "Patch doesn't apply" status. -- 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/
