https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19368
Séverine Queune <severine.que...@bulac.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #55 from Séverine Queune <severine.que...@bulac.fr> --- Sorry Nadine I didn't try sooner, the patch doesn’t apply on more time. Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 19368 - Ignore words when sorting serial search Using index info to reconstruct a base tree... M installer/data/mysql/sysprefs.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref M koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref Auto-merging installer/data/mysql/sysprefs.sql Failed to merge in the changes. Patch failed at 0001 Bug 19368 - Ignore words when sorting serial search -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/