[Koha-bugs] [Bug 31212] Datelastseen should be a datetime

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

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

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |david at davidnind.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #5 from David Nind <david at davidnind.com> ---
Patch no longer applies:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 31212: Change datelastseen from date to datetime field
Using index info to reconstruct a base tree...
M       C4/Items.pm
M       Koha/Schema/Result/Deleteditem.pm
M       Koha/Schema/Result/Item.pm
M       installer/data/mysql/kohastructure.sql
M       koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
Falling back to patching base and 3-way merge...
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 koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging Koha/Schema/Result/Item.pm
Auto-merging Koha/Schema/Result/Deleteditem.pm
Auto-merging C4/Items.pm
CONFLICT (content): Merge conflict in C4/Items.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 31212: Change datelastseen from date to datetime field

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