...and I am the culprit... apologies Mark. On Tue, Mar 6, 2018 at 8:55 PM, John D. Ament <johndam...@apache.org> wrote:
> Thanks Mark. I went through the changes from when the conflict was > introduced to now, I don't see anything missing. I also privately pinged > the culprit. > > On Tue, Mar 6, 2018 at 7:34 PM Mark Thomas <ma...@apache.org> wrote: > > > All, > > > > I have just spent rather longer than I would have liked cleaning up a > > conflicted edit in this month's report. > > > > I have two requests. > > > > 1. If you have submitted your report, please check I didn't accidentally > > remove content. I tried hard not to but the report was a mess and > > something might have slipped through the net. > > > > 2. If you are editing the report please, please, please take care not to > > create edit conflicts and if you do manage to create please clean up > > your own mess rather than leaving it for others to do it for you. > > > > Mark > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > > For additional commands, e-mail: general-h...@incubator.apache.org > > > > >
