OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-20 10:31:28 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Nut.andor
2021-01-26 15:22:47 +01:00
parent 34603c287f
commit aa946bb047
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
View File

@@ -30,13 +30,8 @@ public final class AndorsTrailApplication extends Application {
public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || DEVELOPMENT_FASTSPEED;
public static final int DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION = 999;
<<<<<<< HEAD
public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 56;
public static final String CURRENT_VERSION_DISPLAY = "0.7.12.1";
=======
public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 58;
public static final String CURRENT_VERSION_DISPLAY = "0.7.13";
>>>>>>> Andors-Trail/test_fungi
public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();