| Chunk |
|---|
| Conflicting content |
|---|
/* Jar Stuff */
public static File mcmmo;
<<<<<<< HEAD
//File Paths
public final String mainDirectory = getDataFolder().getPath() + File.separator;
public final String flatFileDirectory = mainDirectory + "FlatFileStuff" + File.separator;
public final String usersFile = flatFileDirectory + "mcmmo.users";
public final String leaderboardDirectory = flatFileDirectory + "Leaderboards" + File.separator;
public final String modDirectory = mainDirectory + "ModConfigs" + File.separator;
=======
/* File Paths */
public static String mainDirectory;
public static String flatFileDirectory;
public static String usersFile;
public static String leaderboardDirectory;
public static String modDirectory;
>>>>>>> cb5ada6ec9a31741125d544b7d3445c84adbdc9c
private static Config configInstance = Config.getInstance();
|
| Solution content |
|---|
/* Jar Stuff */
public static File mcmmo;
//File Paths
public final String mainDirectory = getDataFolder().getPath() + File.separator;
public final String flatFileDirectory = mainDirectory + "FlatFileStuff" + File.separator;
public final String usersFile = flatFileDirectory + "mcmmo.users";
public final String leaderboardDirectory = flatFileDirectory + "Leaderboards" + File.separator;
public final String modDirectory = mainDirectory + "ModConfigs" + File.separator;
private static Config configInstance = Config.getInstance();
|
| File |
|---|
| mcMMO.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
p = this;
LoadTreasures.getInstance().load();
mcmmo = getFile();
<<<<<<< HEAD
if (!Config.getInstance().getUseMySQL()) {
=======
mainDirectory = getDataFolder().getPath() + File.separator;
flatFileDirectory = mainDirectory + "FlatFileStuff" + File.separator;
leaderboardDirectory = flatFileDirectory + "Leaderboards" + File.separator;
modDirectory = mainDirectory + "ModConfigs" + File.separator;
usersFile = flatFileDirectory + "mcmmo.users";
configInstance.load();
if (configInstance.getToolModsEnabled()) {
LoadCustomTools.getInstance().load();
}
if (!configInstance.getUseMySQL()) {
>>>>>>> cb5ada6ec9a31741125d544b7d3445c84adbdc9c
Users.loadUsers();
}
|
| Solution content |
|---|
p = this;
mcmmo = getFile();
if (!configInstance.getUseMySQL()) {
configInstance.load();
LoadTreasures.getInstance().load();
if (configInstance.getToolModsEnabled()) {
LoadCustomTools.getInstance().load();
}
Users.loadUsers();
}
|
| File |
|---|
| mcMMO.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| If statement |
| Method invocation |