http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11559
--- Comment #86 from Jonathan Druart <[email protected]> --- (In reply to Karam Qubsi from comment #78) > 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 . Karam, I have fixed the conflict in the first patch, you should be able to apply all of them in the same order as they are on this bug report. -- 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/
