https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22284
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #243 from Katrin Fischer <[email protected]> --- Patch doesn't apply, can you please rebase? Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 22284: New ft_local_hold_group column, and 'holgroup' enum option Applying: Bug 22284: Add new checkbox in Library Groups Applying: Bug 22284: New hold group options in smart-rules Applying: Bug 22284: Control hold groups in C4::Reserves Applying: Bug 22284: New methods in Koha::Library::Groups and Koha::Library Using index info to reconstruct a base tree... M Koha/Library.pm M t/db_dependent/Koha/Libraries.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Koha/Libraries.t CONFLICT (content): Merge conflict in t/db_dependent/Koha/Libraries.t Auto-merging Koha/Library.pm CONFLICT (content): Merge conflict in Koha/Library.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 22284: New methods in Koha::Library::Groups and Koha::Library 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-22284-New-methods-in-KohaLibraryGroups-and-Koh-yTz2MT.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/
