http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15434
Nicole C. Engard <neng...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |Patch doesn't apply
--- Comment #9 from Nicole C. Engard <neng...@gmail.com> ---
Applying: Bug 15434: Search criteria definition table
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
CONFLICT (content): Merge conflict in
koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
Failed to merge in the changes.
Patch failed at 0001 Bug 15434: Search criteria definition table
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-15434-Search-criteria-definition-table-QMpnoE.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/
