https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18420 --- Comment #39 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Still having problems, please rebase! Applying: Bug 18420: Do not use 'S' as patron category code in other tests Using index info to reconstruct a base tree... M t/db_dependent/Acquisition/OrderUsers.t M t/db_dependent/Circulation.t M t/db_dependent/Holds/HoldFulfillmentPolicy.t M t/db_dependent/Holds/HoldItemtypeLimit.t Falling back to patching base and 3-way merge... Auto-merging t/db_dependent/Holds/HoldItemtypeLimit.t Auto-merging t/db_dependent/Holds/HoldFulfillmentPolicy.t Auto-merging t/db_dependent/Circulation.t CONFLICT (content): Merge conflict in t/db_dependent/Circulation.t -- You are receiving this mail because: You are watching all bug changes.