On 19/03/10 23:41, Markus Roberts wrote: > In one corner, we have Luke's event patch (#2759); in the other, > Brice's checksum => none patch (#2929). In the middle, the current > champion, the code from master.
I've a good news for you. I removed from #2929 the patch that produces the conflict and isolated it in brice:tickets/0.25.x/3396. That way, when Luke will modify his events branch, you'll be able to merge relatively easily #3396. -- Brice Figureau My Blog: http://www.masterzen.fr/ -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to puppet-...@googlegroups.com. To unsubscribe from this group, send email to puppet-dev+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
