http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8702
wajasu <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #5 from wajasu <[email protected]> --- I tried to apply the patch. I got: Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc I don't even see stopwords-admin-search.inc mentioned in your patch. So I am too confused to make any assumptions. See: http://paste.koha-community.org/173 Can you rebase and resubmit? -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
