https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16461
Simon Pouchol <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #9 from Simon Pouchol <[email protected]> --- Looks like this patch doesn't apply : Applying: Bug 16461 - Add branch and barcode in accountline table for overdues Using index info to reconstruct a base tree... M C4/Overdues.pm M installer/data/mysql/kohastructure.sql M koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt M t/db_dependent/Circulation.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Circulation.t CONFLICT (content): Merge conflict in t/db_dependent/Circulation.t Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt Auto-merging installer/data/mysql/kohastructure.sql Auto-merging C4/Overdues.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 16461 - Add branch and barcode in accountline table for overdues -- 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/
