[Koha-bugs] [Bug 22784] Archiving Purchase Suggestions

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

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

Séverine Queune <severine.queune at bulac.fr> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #12 from Séverine Queune <severine.queune at bulac.fr> ---
Hi Jonathan, 

This patch doesn't apply on master :

Applying: Bug 22784: DB Changes
Using index info to reconstruct a base tree...
M       Koha/Schema/Result/Suggestion.pm
M       installer/data/mysql/kohastructure.sql
Falling back to patching base and 3-way merge...
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging Koha/Schema/Result/Suggestion.pm
Applying: Bug 22784: DBIC Changes
Using index info to reconstruct a base tree...
M       Koha/Schema/Result/Suggestion.pm
Falling back to patching base and 3-way merge...
Auto-merging Koha/Schema/Result/Suggestion.pm
CONFLICT (content): Merge conflict in Koha/Schema/Result/Suggestion.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 22784: DBIC Changes

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