http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12772

--- Comment #35 from Kyle M Hall <[email protected]> ---
(In reply to Kyle M Hall from comment #34)
> I see merge conflict markers in the first patch.

Make that the second patch.

-- 
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
[email protected]
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/

Reply via email to