https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=32734
--- Comment #9 from Tomás Cohen Arazi <tomasco...@gmail.com> --- (In reply to Kyle M Hall from comment #8) > Bug 32734 Depends on bug 31801 (Passed QA) > Follow? [(y)es, (n)o] y > > Bug 31801 Depends on bug 31800 (Passed QA) > Follow? [(y)es, (n)o] y > > Bug 31800 - REST API: POST endpoint for Biblios > > 147714 - Bug 31800: Add REST endpoint to add a biblio > > Apply? [(y)es, (n)o, (i)nteractive] y > Applying: Bug 31800: Add REST endpoint to add a biblio > Using index info to reconstruct a base tree... > 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 > error: Failed to merge in the changes. > Patch failed at 0001 Bug 31800: Add REST endpoint to add a biblio Maybe I just pushed that one? -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/
