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

7
scripts/build.number
View File

@ -1,3 +1,6 @@
#Build Number for ANT. Do not edit!
#Thu Jul 06 15:07:23 EDT 2023
build.number=502
#Thu Jul 06 15:11:32 EDT 2023
build.number=500
>>>>>>>=7cdf84bb265e7fda5b98d2386dab1855de8383eb
=\=\=\=\=\=\=
<<<<<<<=HEAD