http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11559
--- Comment #78 from Karam Qubsi <[email protected]> --- Hi Jessie, I tried to apply the patch on master , but it wasn't applied , I have the following error : Auto-merging svc/bib CONFLICT (content): Merge conflict in svc/bib Failed to merge in the changes. Patch failed at 0001 Bug 11559 - Supporting changes for Rancor is there any order that I have to follow to apply the patches ? thank you for your great efforts . -- 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/
