https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18633
Alex Buckley <alexbuck...@catalyst.net.nz> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |alexbuck...@catalyst.net.nz
Status|Needs Signoff |Patch doesn't apply
--- Comment #7 from Alex Buckley <alexbuck...@catalyst.net.nz> ---
Merge conflict on clean up to date branch
Applying: Bug 18633: Remove useless use of CGI TT plugin
Using index info to reconstruct a base tree...
M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 18633: Remove useless use of CGI TT plugin
The copy of the patch that failed is found in:
/home/vagrant/kohaclone/.git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in /tmp/Bug-18633-Remove-useless-use-of-CGI-TT-plugin-W31_uJ.patch
--
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/
