https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35145
Pedro Amorim <pedro.amo...@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #17 from Pedro Amorim <pedro.amo...@ptfs-europe.com> --- Applying: Bug 35145 : Schema file Using index info to reconstruct a base tree... M Koha/Schema/Result/BorrowerAttributeType.pm Falling back to patching base and 3-way merge... Auto-merging Koha/Schema/Result/BorrowerAttributeType.pm CONFLICT (content): Merge conflict in Koha/Schema/Result/BorrowerAttributeType.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 35145 : Schema file Patches don't apply on current master. Can you please submit a squashed version of the patches or make obsolete those not needed. Reach out on IRC, we can help with this if needed. -- 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/