[Koha-bugs] [Bug 2693] Tagging: Add filter by name
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Sun Sep 29 08:09:44 CEST 2013
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=2693
I'm just a bot <gitbot at bugs.koha-community.org> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
When did the bot| |2013-09-29
last check this| |
--- Comment #4 from I'm just a bot <gitbot at bugs.koha-community.org> ---
Applying: Bug 2693 - Tagging: Add filter by name
Using index info to reconstruct a base tree...
M koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
Patch failed at 0001 Bug 2693 - Tagging: Add filter by name
The copy of the patch that failed is found in:
/home/christopher/git/koha/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
--
You are receiving this mail because:
You are the QA Contact for the bug.
You are watching all bug changes.
More information about the Koha-bugs
mailing list