http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12802
Brendan Gallagher <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] | |m --- Comment #17 from Brendan Gallagher <[email protected]> --- Jonathan - I got a merge CONFLICT on the updatedatabase.pl part. After I fix the updatedatabase.pl part - I git-bz apply --continue and get this.. Auto-merging t/db_dependent/Members.t CONFLICT (content): Merge conflict in t/db_dependent/Members.t Auto-merging t/db_dependent/Letters.t Auto-merging opac/opac-shareshelf.pl Auto-merging opac/opac-memberentry.pl Auto-merging misc/cronjobs/overdue_notices.pl Auto-merging C4/Reserves.pm CONFLICT (content): Merge conflict in C4/Reserves.pm Auto-merging C4/Message.pm CONFLICT (content): Merge conflict in C4/Message.pm Auto-merging C4/Members.pm Auto-merging C4/Letters.pm Can you rebase for me? Send me IRC ping (or @later) and I will test once you have rebased. *Also note I do see the depends on 9043. But 9043 is already pushed to master ( so I think I don't need to also include 9043 patch - that is correct right? ) Let me know if I am wrong here. -- 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/
