[Koha-bugs] [Bug 16149] Generate and send custom notices based on report output

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

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

Hugo Agud <hagud at orex.es> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |hagud at orex.es

--- Comment #5 from Hugo Agud <hagud at orex.es> ---
Bug 16149 - Generate and send custom notices based on report output

63454 - Bug 16149 - Generate and send custom notices based on report output
63455 - Bug 16149 - Unit tests

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 16149 - Generate and send custom notices based on report output
Using index info to reconstruct a base tree...
M       C4/Reports/Guided.pm
Falling back to patching base and 3-way merge...
Auto-merging C4/Reports/Guided.pm
Applying: Bug 16149 - Unit tests
Using index info to reconstruct a base tree...
M       t/db_dependent/Reports/Guided.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Reports/Guided.t
CONFLICT (content): Merge conflict in t/db_dependent/Reports/Guided.t          
                                                                               
                              6d20h 1.30 2x2.8GHz 3.7G85% 2017-08-23 08:09:18
Failed to merge in the changes.
Patch failed at 0001 Bug 16149 - Unit tests
The copy of the patch that failed is found in:
   /home/vagrant/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-16149---Unit-tests-IoVGvi.patch

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