<html><head></head><body><div style="color:#000; background-color:#fff; font-family:Helvetica Neue, Helvetica, Arial, Lucida Grande, sans-serif;font-size:13px"> <div class="qtdSeparateBR" id="yui_3_16_0_ym19_1_1537324774190_12997"><font size="3"><br></font><div id="yui_3_16_0_ym19_1_1537324774190_13000"><font size="3">Hi Mark,</font></div><div id="yui_3_16_0_ym19_1_1537324774190_13233"><font size="3"><br></font></div><div dir="ltr" id="yui_3_16_0_ym19_1_1537324774190_13114"><font id="yui_3_16_0_ym19_1_1537324774190_13275" size="3">Darn it all. I didn't mean to reply to your email only. I meant to send this to the Dev list. </font><br></div><div dir="ltr" id="yui_3_16_0_ym19_1_1537324774190_13115"><br></div></div><div class="yahoo_quoted" id="yui_3_16_0_ym19_1_1537324774190_12984" style="display: block;"> <div style="font-family: Helvetica Neue, Helvetica, Arial, Lucida Grande, sans-serif; font-size: 13px;" id="yui_3_16_0_ym19_1_1537324774190_12983"> <div style="font-family: HelveticaNeue, Helvetica Neue, Helvetica, Arial, Lucida Grande, sans-serif; font-size: 16px;" id="yui_3_16_0_ym19_1_1537324774190_12982"> <div dir="ltr" id="yui_3_16_0_ym19_1_1537324774190_12995"><font id="yui_3_16_0_ym19_1_1537324774190_12996" size="2" face="Arial"> On Thursday, September 6, 2018 10:56 PM, "Mark Atwood, Project Manager" <mark.atwood@ntpsec.org> wrote:<br></font></div> <div class="y_msg_container" id="yui_3_16_0_ym19_1_1537324774190_12981"><div id="yiv8703356950"><div id="yui_3_16_0_ym19_1_1537324774190_12980"><div dir="ltr" id="yui_3_16_0_ym19_1_1537324774190_12979">> Thank you Mike! Please submit the PEP8 MR after you've fixed the merge conflict. I will review your existing MRs.</div></div></div><br><div dir="ltr" id="yui_3_16_0_ym19_1_1537324774190_13155">It
took me a bit but I think I have come around to your way of thinking.
At first I thought you were going to review the current MRs and accept
them. Then I would fix the conflict on my side (fork) and submit. Since
that hasn't happened, I started thinking maybe I misunderstood
something. <br id="yui_3_16_0_ym19_1_1537324774190_13156" clear="none"></div><div dir="ltr" id="yui_3_16_0_ym19_1_1537324774190_13157"><br id="yui_3_16_0_ym19_1_1537324774190_13158" clear="none"></div><div dir="ltr" id="yui_3_16_0_ym19_1_1537324774190_13159">Now
I think I get it. I closed one of my existing MRs; the one that added
the PI 3 Model B+ hardware to clockmaker. That was the one that would
have conflicted with the PEP8 cleanup of clockmaker. </div><div dir="ltr" id="yui_3_16_0_ym19_1_1537324774190_13160"><br id="yui_3_16_0_ym19_1_1537324774190_13161" clear="none"></div><div dir="ltr" id="yui_3_16_0_ym19_1_1537324774190_13162">I created a new MR that adds the 3B+ HW to clockmaker in a PEP8-compliant way. <br id="yui_3_16_0_ym19_1_1537324774190_13163" clear="none"></div><div dir="ltr" id="yui_3_16_0_ym19_1_1537324774190_13164"><br id="yui_3_16_0_ym19_1_1537324774190_13165" clear="none"></div><div dir="ltr" id="yui_3_16_0_ym19_1_1537324774190_13166">I also submitted the MR for the clockmaker PEP8 cleanup. <br id="yui_3_16_0_ym19_1_1537324774190_13167" clear="none"></div><div dir="ltr" id="yui_3_16_0_ym19_1_1537324774190_13168"><br id="yui_3_16_0_ym19_1_1537324774190_13169" clear="none"></div><div dir="ltr" id="yui_3_16_0_ym19_1_1537324774190_13170">There is still the existing MR for the HOWTO section numbers and indentation. <br id="yui_3_16_0_ym19_1_1537324774190_13171" clear="none"></div><div dir="ltr" id="yui_3_16_0_ym19_1_1537324774190_13172"><br id="yui_3_16_0_ym19_1_1537324774190_13173" clear="none"></div><div dir="ltr" id="yui_3_16_0_ym19_1_1537324774190_13174">I hope this is what you meant. If not, please let me know. <br id="yui_3_16_0_ym19_1_1537324774190_13175" clear="none"></div><div dir="ltr" id="yui_3_16_0_ym19_1_1537324774190_13176"><br id="yui_3_16_0_ym19_1_1537324774190_13177" clear="none"></div><div dir="ltr" id="yui_3_16_0_ym19_1_1537324774190_13178">Sincerely,</div><div dir="ltr" id="yui_3_16_0_ym19_1_1537324774190_13404">Mike Major</div></div> </div> </div> </div></div></body></html>