https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22778
Liz Rea <wizzy...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |wizzy...@gmail.com
Status|Needs Signoff |Patch doesn't apply
--- Comment #2 from Liz Rea <wizzy...@gmail.com> ---
Oh you are not going to like this:
Using index info to reconstruct a base tree...
M C4/Suggestions.pm
Falling back to patching base and 3-way merge...
Auto-merging C4/Suggestions.pm
CONFLICT (content): Merge conflict in C4/Suggestions.pm
error: Failed to merge in the changes.
Terribly sorry >.<
Liz
--
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/
