[Koha-bugs] [Bug 14399] Fix inventory.pl part two (following 12913)

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14399

--- Comment #34 from Mason James <mtj at kohaaloha.com> ---
Patchset has conflicts on 16.05.x branch

-----------------
mason at xen1:~/g/k/16.05.x$ git bz apply -s 14399
You seem to have moved HEAD since the last 'am' failure.
Not rewinding to ORIG_HEAD
No rebase in progress?
Bug 14399 - Fix inventory.pl part two (following 12913)

63465 - Bug 14399: Prevent display of double zero notforloan status
63466 - Bug 14399: Numerous small refinements to the inventory script
63467 - Bug 14399: Interface changes
63468 - Bug 14399: Results form also needs a few interface changes

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 14399: Prevent display of double zero notforloan status
Applying: Bug 14399: Numerous small refinements to the inventory script
Using index info to reconstruct a base tree...
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
CONFLICT (content): Merge conflict in tools/inventory.pl
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 14399: Numerous small refinements to the inventory
script
The copy of the patch that failed is found in:
   /home/mason/g/k/16.05.x/.git/rebase-apply/patch

-- 
You are receiving this mail because:
You are watching all bug changes.