https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29566
Lisette Scheer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] | |m Status|Needs Signoff |Patch doesn't apply --- Comment #11 from Lisette Scheer <[email protected]> --- Applying: Bug 29566: Add API route for fetching item slip content Using index info to reconstruct a base tree... M Koha/REST/V1/Items.pm M api/v1/swagger/paths/items.yaml M api/v1/swagger/swagger.yaml Falling back to patching base and 3-way merge... Auto-merging api/v1/swagger/swagger.yaml CONFLICT (content): Merge conflict in api/v1/swagger/swagger.yaml Auto-merging api/v1/swagger/paths/items.yaml CONFLICT (content): Merge conflict in api/v1/swagger/paths/items.yaml Auto-merging Koha/REST/V1/Items.pm -- 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/
