https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39816
Emmi Takkinen <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #5 from Emmi Takkinen <[email protected]> --- Patch doesn't apply: Applying: Bug 39816: Allow embedding `late_since_days` in baskets Using index info to reconstruct a base tree... M api/v1/swagger/definitions/basket.yaml M api/v1/swagger/paths/acquisitions_baskets.yaml M api/v1/swagger/paths/acquisitions_orders.yaml Falling back to patching base and 3-way merge... Auto-merging api/v1/swagger/paths/acquisitions_orders.yaml Auto-merging api/v1/swagger/paths/acquisitions_baskets.yaml CONFLICT (content): Merge conflict in api/v1/swagger/paths/acquisitions_baskets.yaml Auto-merging api/v1/swagger/definitions/basket.yaml CONFLICT (content): Merge conflict in api/v1/swagger/definitions/basket.yaml error: Failed to merge in the changes. Patch failed at 0001 Bug 39816: Allow embedding `late_since_days` in baskets 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-39816-Allow-embedding-latesincedays-in-baskets-7u_k12.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/
