http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13014
Katrin Fischer <katrin.fisc...@bsz-bw.de> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Signed Off |Patch doesn't apply
CC| |katrin.fisc...@bsz-bw.de
--- Comment #13 from Katrin Fischer <katrin.fisc...@bsz-bw.de> ---
Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 13014: Notify budget owner on new suggestion - UT
Using index info to reconstruct a base tree...
M C4/Suggestions.pm
M t/db_dependent/Suggestions.t
Falling back to patching base and 3-way merge...
Auto-merging t/db_dependent/Suggestions.t
CONFLICT (content): Merge conflict in t/db_dependent/Suggestions.t
Auto-merging C4/Suggestions.pm
Failed to merge in the changes.
Patch failed at 0001 Bug 13014: Notify budget owner on new suggestion - UT
--
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
