https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17006
Michal Denar <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #57 from Michal Denar <[email protected]> --- Please rebase on master I get error: Using index info to reconstruct a base tree... 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 Failed to merge in the changes. Patch failed at 0001 Bug 17006: OpenAPI spec Thank You Mike -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://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/
