http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9129
Katrin Fischer <katrin.fisc...@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #43 from Katrin Fischer <katrin.fisc...@bsz-bw.de> --- There are some conflicts, due to recent changes in master (I suspect for the on-site quotas), please fix: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 9129 - Add the ability to set the maximum fine for an item to its replacement price Using index info to reconstruct a base tree... M Koha/Schema/Result/Issuingrule.pm M admin/smart-rules.pl M installer/data/mysql/kohastructure.sql M koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt 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 CONFLICT (content): Merge conflict in admin/smart-rules.pl Auto-merging Koha/Schema/Result/Issuingrule.pm CONFLICT (content): Merge conflict in Koha/Schema/Result/Issuingrule.pm Failed to merge in the changes. Patch failed at 0001 Bug 9129 - Add the ability to set the maximum fine for an item to its replacement price The copy of the patch that failed is found in: /home/katrin/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/SIGNED-OFF-patch-Bug-9129---Add-the-ability-to-set-G3gYvN.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/