[Koha-bugs] [Bug 4461] Context-sensitive report a problem screen

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

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

Eric <eric.gosselin.5 at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |eric.gosselin.5 at gmail.com

--- Comment #5 from Eric <eric.gosselin.5 at gmail.com> ---
Patch doesn't apply :

Some problems occurred applying patches from bug 4461:
<h1>Something went wrong !</h1>Applying: Bug 4461: Add a context-sensitive
'Report a Problem' feature to OPAC
Using index info to reconstruct a base tree...
M       Koha/Schema/Result/Borrower.pm
M       installer/data/mysql/kohastructure.sql
M       koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
Auto-merging installer/data/mysql/kohastructure.sql
Auto-merging Koha/Schema/Result/Borrower.pm
CONFLICT (content): Merge conflict in Koha/Schema/Result/Borrower.pm
Patch failed at 0001 Bug 4461: Add a context-sensitive 'Report a Problem'
feature to OPAC
The copy of the patch that failed is found in: .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.
error: Failed to merge in the changes.
Bug 4461 - Context-sensitive report a problem screen

59032 - Bug 4461: Add a context-sensitive 'Report a Problem' feature to OPAC

-- 
You are receiving this mail because:
You are watching all bug changes.
You are the QA Contact for the bug.