https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=22605
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #8 from Katrin Fischer <[email protected]> --- Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 22605: Add ability to edit a search on staff interface .git/rebase-apply/patch:441: trailing whitespace. warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... M C4/Search.pm M Koha/SearchEngine/Elasticsearch/QueryBuilder.pm M catalogue/search.pl M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt .git/rebase-apply/patch:441: trailing whitespace. warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt Auto-merging catalogue/search.pl Auto-merging Koha/SearchEngine/Elasticsearch/QueryBuilder.pm CONFLICT (content): Merge conflict in Koha/SearchEngine/Elasticsearch/QueryBuilder.pm Auto-merging C4/Search.pm -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
