https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23114 Eric Bégin <eric.begin@inLibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |eric.begin@inLibro.com --- Comment #3 from Eric Bégin <eric.begin@inLibro.com> --- Applying: Bug 23114 - Inventory: allow to scan barcodes Using index info to reconstruct a base tree... M tools/inventory.pl Falling back to patching base and 3-way merge... Auto-merging tools/inventory.pl CONFLICT (content): Merge conflict in tools/inventory.pl -- You are receiving this mail because: You are watching all bug changes.