fix merge conflicts

This commit is contained in:
idk
2023-07-06 15:12:11 -04:00
26 changed files with 135 additions and 19 deletions

View File

@ -166,7 +166,11 @@
</code>
</h4>
<pre><code class="language-sh">mkdir ~/tmp-i2pbrowser &amp;&amp; cd ~/tmp-i2pbrowser
<<<<<<< HEAD
wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.0.9/i2pbrowser.tar.gz
=======
wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.1.0/i2pbrowser.tar.gz
>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
tar xvzf i2pbrowser.tar.gz &amp;&amp; cd i2pbrowser
## THIS STEP IS OPTIONAL but it will force the system to use Tor Browser from within the i2pbrowser directory.
# This probably offers better security than vanilla Firefox.
@ -256,8 +260,13 @@ tar xvzf i2pbrowser.tar.gz &amp;&amp; cd i2pbrowser
</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>