https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17005
Josef Moravec <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff --- Comment #38 from Josef Moravec <[email protected]> --- (In reply to Ere Maijala from comment #34) > I bz-applied this including dependencies but there seems to be a conflict: > > Applying: Bug 17005: Add checked_in checkouts to REST API response > Using index info to reconstruct a base tree... > M Koha/REST/V1/Checkouts.pm > M api/v1/swagger/paths/checkouts.json > Falling back to patching base and 3-way merge... > Auto-merging api/v1/swagger/paths/checkouts.json > Auto-merging Koha/REST/V1/Checkouts.pm > CONFLICT (content): Merge conflict in Koha/REST/V1/Checkouts.pm I rebased the patches on to of bug 17003, should apply cleanly now -- 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/
