fix merge conflicts

2023-07-06 15:12:11 -04:00
parent fffba3dd6d 7cdf84bb26
commit aa95cab914
26 changed files with 135 additions and 19 deletions
--- a/docs/I2PCommonBrowser.html
+++ b/docs/I2PCommonBrowser.html
@ -960,8 +960,13 @@
        </span>
        <ul>
          <li>
+<<<<<<< HEAD
            <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
              Source Repository: (https://i2pgit.org/idk/i2p.plugins.firefox)
+=======
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
            </a>
          </li>
        </ul>