[Koha-bugs] [Bug 16825] Add API route for getting an item
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Fri Jul 5 21:19:57 CEST 2019
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16825
Bouzid Fergani <bouzid.fergani at inlibro.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |bouzid.fergani at inlibro.com
--- Comment #44 from Bouzid Fergani <bouzid.fergani at inlibro.com> ---
Hi,
Thanks to rebase this patch.
Bug 16825 - Add API route for getting an item
91124 - Bug 16825: Add API route for getting an item
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 16825: Add API route for getting an item
Using index info to reconstruct a base tree...
M api/v1/swagger/definitions.json
M api/v1/swagger/paths.json
Falling back to patching base and 3-way merge...
Auto-merging api/v1/swagger/paths.json
CONFLICT (content): Merge conflict in api/v1/swagger/paths.json
Auto-merging api/v1/swagger/definitions.json
error: Failed to merge in the changes.
Patch failed at 0001 Bug 16825: Add API route for getting an item
The copy of the patch that failed is found in: .git/rebase-apply/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-16825-Add-API-route-for-getting-an-item-uUF0c9.patch
Bouzid.
--
You are receiving this mail because:
You are watching all bug changes.
More information about the Koha-bugs
mailing list