[Koha-bugs] [Bug 12747] Add extra column in Z3950 search result

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12747

Jesse Maseto <jesse at bywatersolutions.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |jesse at bywatersolutions.com
             Status|Needs Signoff               |Patch doesn't apply

--- Comment #41 from Jesse Maseto <jesse at bywatersolutions.com> ---
This patch no longer applies:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 12747 - Add extra column in Z3950 search
Using index info to reconstruct a base tree...
M       installer/data/mysql/sysprefs.sql
M       koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
Auto-merging installer/data/mysql/sysprefs.sql
CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql
Failed to merge in the changes.
Patch failed at 0001 Bug 12747 - Add extra column in Z3950 search
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-12747---Add-extra-column-in-Z3950-search-rZkwMW.patch

-- 
You are receiving this mail because:
You are watching all bug changes.