fix merge conflicts
This commit is contained in:
@ -166,7 +166,11 @@
|
||||
</code>
|
||||
</h4>
|
||||
<pre><code class="language-sh">mkdir ~/tmp-i2pbrowser && 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 && 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 && 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>
|
||||
|
Reference in New Issue
Block a user