http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7642
Robin Sheat <ro...@catalyst.net.nz> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Patch doesn't apply |Needs Signoff
--- Comment #31 from Robin Sheat <ro...@catalyst.net.nz> ---
I think the issue was that I'd based it off a branch that you didn't have, and
so it couldn't do 3-way merge when it found a conflict. Try this, which is
based off current master.
--
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/
