dandri/i2p.i2p
1
0 Fork 0
mirror of https://github.com/i2p/i2p.i2p.git synced 2026-10-22 17:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict that got checked in

Browse Source
This commit is contained in:
eyedeekay committed 2025-10-21 14:32:01 -04:00
1 parent a6cc1456e6
commit 09bb390453
1 file changed
-6
Download Patch File Download Diff File Expand all files Collapse all files
router/java/src/net/i2p/router/RouterVersion.java
-6
View File
@@ -20,13 +20,7 @@ public class RouterVersion {
public final static String VERSION = CoreVersion.VERSION;
/** for example: "beta", "alpha", "rc" */
public final static String QUALIFIER = "";
<<<<<<< HEAD
public final static long BUILD = 2;
||||||| c553f7806
public final static long BUILD = 0;
=======
public final static long BUILD = 1;
>>>>>>> 32e80a18900fbeb60626e6e6d1a42191137ee897
/** for example "-test" */
public final static String EXTRA = "";
public final static String FULL_VERSION = VERSION + "-" + BUILD + QUALIFIER + EXTRA;