digitalmars.D - dconf.org: Merge conflict marker in the banner?
- Nicholas Wilson (7/8) Dec 08 2016 lines 23-28 of index.html
lines 23-28 of index.html <div class="logo"><<<<<<< 08a5395ead0589eb18e62d3b420781bfa5b0f3e2 <a href="./index.html"><img src="./images/dconf_logo_2017.svg" alt="DConf 2017: May 4–6 · Berlin" height="116" border="0" /></a> =======</div><!-- end <div class="logo"> -->Fix year from 2016 to 2017
Dec 08 2016