http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=10937 Kyle M Hall <kyle@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |kyle@bywatersolutions.com --- Comment #6 from Kyle M Hall <kyle@bywatersolutions.com> --- Applying: Sponsor: Vanier college /home/koha/kohaclone/.git/rebase-apply/patch:24: tab in indent. LEFT JOIN authorised_values ON searchcategory = authorised_value WHERE searchcategory > '' /home/koha/kohaclone/.git/rebase-apply/patch:62: tab in indent. quantity SMALLINT(6) default NULL, -- suggested quantity to be purchased /home/koha/kohaclone/.git/rebase-apply/patch:63: tab in indent. currency VARCHAR(3) default NULL, -- suggested currency for the suggested price /home/koha/kohaclone/.git/rebase-apply/patch:64: tab in indent. price DECIMAL(28,6) default NULL, -- suggested price /home/koha/kohaclone/.git/rebase-apply/patch:65: tab in indent. total DECIMAL(28,6) default NULL, -- suggested total cost (price*quantity updated for currency) fatal: sha1 information is lacking or useless (C4/Koha.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Sponsor: Vanier college -- You are receiving this mail because: You are watching all bug changes.