https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12365 Lisette Scheer <lisetteslatah@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #26 from Lisette Scheer <lisetteslatah@gmail.com> --- I got the following error when applying the notes for rules patch. CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt Auto-merging installer/data/mysql/kohastructure.sql Auto-merging admin/smart-rules.pl Failed to merge in the changes. Patch failed at 0001 Bug 12365: Notes for rules 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-12365-Notes-for-rules-osNzXn.patch Lisette -- You are receiving this mail because: You are watching all bug changes.