https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18420
--- Comment #39 from Katrin Fischer <[email protected]> --- 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. _______________________________________________ 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/
