https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9525
Lisette Scheer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #35 from Lisette Scheer <[email protected]> --- 103828 - Bug 9525: Group floating rules 103829 - Bug 9525: Schema changes - DO NOT PUSH 103830 - Bug 9525: Fixing floating on return 103831 - Bug 9525: Add support for regexps in conditional floating clauses Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 9525: Group floating rules Using index info to reconstruct a base tree... M C4/Circulation.pm M installer/data/mysql/kohastructure.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt Auto-merging installer/data/mysql/kohastructure.sql Auto-merging C4/Circulation.pm CONFLICT (content): Merge conflict in C4/Circulation.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 9525: Group floating rules -- 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/
