https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7607 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA CC| |david@davidnind.com --- Comment #5 from David Nind <david@davidnind.com> --- Patch no longer applies 8-( : root@kohadevbox:koha(bz7607)$ git bz apply 7607 Bug 7607 - Advanced search: Index and search term don't match when leaving fields empty 107963 - Bug 7607: Fix adv search when leaving fields empty Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 7607: Fix adv search when leaving fields empty Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 7607: Fix adv search when leaving fields empty The copy of the patch that failed is found in: .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-7607-Fix-adv-search-when-leaving-fields-empty-P2nq_2.patch -- You are receiving this mail because: You are watching all bug changes.