idk/i2p.plugins.firefox
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
idk
2023-07-06 15:12:11 -04:00
parent fffba3dd6d 7cdf84bb26
commit aa95cab914
26 changed files with 135 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docs/OSX.html
View File

@ -159,7 +159,11 @@
file with any Java greater than Java 8.
</p>
<pre><code class="language-sh">mkdir ~/tmp-i2pfirefox &amp;&amp; cd ~/tmp-i2pfirefox
<<<<<<< HEAD
wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.0.9/i2pfirefox.zip
=======
wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.1.0/i2pfirefox.zip
>>>>>>> 7cdf84bb265e7fda5b98d2386dab1855de8383eb
unzip i2pfirefox.zip
./cmd/i2pfirefox.cmd
@ -205,8 +209,13 @@ export JAVA_HOME=`/usr/libexec/java_home -v 17`
</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>