https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29099
Lisette Scheer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] | |m --- Comment #20 from Lisette Scheer <[email protected]> --- Applying: Bug 29099: Add bundle support to inventory tool Using index info to reconstruct a base tree... M C4/Items.pm M koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt M tools/inventory.pl Falling back to patching base and 3-way merge... Auto-merging tools/inventory.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt Auto-merging C4/Items.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 29099: Add bundle support to inventory tool -- 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/
