https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=33736
Laurence Rault <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #4 from Laurence Rault <[email protected]> --- Apply? [(y)es, (n)o, (i)nteractive] Applying: Bug 33736: Add pendingbookings report Using index info to reconstruct a base tree... M api/v1/swagger/paths/bookings.yaml M koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt Auto-merging api/v1/swagger/paths/bookings.yaml error: Failed to merge in the changes. Patch failed at 0001 Bug 33736: Add pendingbookings report [33mhint: Use 'git am --show-current-patch=diff' to see the failed patch[m 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-33736-Add-pendingbookings-report-66f05im8.patch -- 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/
