https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34989
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #8 from David Nind <[email protected]> --- Thanks Baptiste! Apologies for taking so long to re-test. The patch no longer applies on main 8-(... git bz apply 34989 Bug 34989 - Subscription cannot be added if a control field is set up in "Additional Fields" parameter 174979 - Bug 34989: [23.11] Subscription cannot be added if a control field is set up in "Additional Fields" parameter 174980 - Bug 34989: Subscription cannot be added if a control field is set up in Additional Fields parameter Apply? [(y)es, (n)o, (i)nteractive] i Applying: Bug 34989: Subscription cannot be added if a control field is set up in Additional Fields parameter Using index info to reconstruct a base tree... M Koha/Object/Mixin/AdditionalFields.pm Falling back to patching base and 3-way merge... Auto-merging Koha/Object/Mixin/AdditionalFields.pm CONFLICT (content): Merge conflict in Koha/Object/Mixin/AdditionalFields.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 34989: Subscription cannot be added if a control field is set up in Additional Fields parameter -- 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/
