Administrivia locations changed

Author: rocky

htdocs/index.html

@@ -179,11 +179,8 @@ <h2>Screenshots</h2>
 <div style="clear: left;">&nbsp;</div>
 <h2>Documentation</h2>
 <ul>
-<<<<<<< HEAD
-=======
   <li><a href="https://sites.google.com/view/bashdboutlined/home">BASHDB
 Reference</a> &ndash; Debugger documentation online in outline format from Rod Smith</li>
->>>>>>> f28bb20 (Adjust reference to point to readthedocs)
   <li><a href="https://bashdb.readthedocs.io/en/latest/">BASHDB
 Reference</a> &ndash; Debugger documentation on ReadTheDocs</li>
   <li><a href="http://bashdb.sourceforge.net/bashdb-man.html">BASHDB