[Koha-bugs] [Bug 11023] Toggle new status for items

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

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11023

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #65 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Fixed the first conflict on the tools home page, but then got stuck with a
harder conflict:

Apply? [(y)es, (n)o, (i)nteractive] i
Applying: Bug 11023: Add the ability to specify fields from biblioitems table.
Applying: Bug 11023: Add UT for C4::Items::ToggleNewStatus
Applying: Bug 11023: FIX - condition on biblioitems table does not work
Applying: Bug 11023: Use DBIx-Class to retrieve column names
fatal: sha1 information is lacking or useless (C4/Items.pm).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 11023: Use DBIx-Class to retrieve column names
The copy of the patch that failed is found in:
   /home/katrin/kohaclone/.git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in
/tmp/Bug-11023-Use-DBIx-Class-to-retrieve-column-names-J9vKlx.patch

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