| Chunk |
|---|
| Conflicting content |
|---|
public class EasyFPSReference {
<<<<<<< HEAD
public static final String VERSION = "2.0.3";
=======
public static final String VERSION = "2.0.2";
>>>>>>> 758c8a759a973c5b25c13b8c0fda846e0c36a32a
public static final String UPDATE_URL = "https://dl.dropbox.com/u/34938401/Mods/On%20Topic/Mods/EasyFPS/Version.txt";
public static final String CHANGELOG_URL = "https://dl.dropbox.com/u/34938401/Mods/On%20Topic/Mods/EasyFPS/Changelog.txt";
|
| Solution content |
|---|
public class EasyFPSReference {
public static final String VERSION = "2.0.3";
public static final String UPDATE_URL = "https://dl.dropbox.com/u/34938401/Mods/On%20Topic/Mods/EasyFPS/Version.txt";
public static final String CHANGELOG_URL = "https://dl.dropbox.com/u/34938401/Mods/On%20Topic/Mods/EasyFPS/Changelog.txt";
|
| File |
|---|
| EasyFPSReference.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
import cpw.mods.fml.common.Mod.Init;
import cpw.mods.fml.common.event.FMLInitializationEvent;
<<<<<<< HEAD
@Mod(modid = "easyfps_Vz", name = "EasyFPS", version = "by Vazkii. Version [2.0.3] for 1.4.4/5")
=======
@Mod(modid = "easyfps_Vz", name = "EasyFPS", version = "by Vazkii. Version [2.0.2] for 1.4.2.")
>>>>>>> 758c8a759a973c5b25c13b8c0fda846e0c36a32a
public class mod_EasyFPS {
protected static boolean fpsEnabled = true; |
| Solution content |
|---|
import cpw.mods.fml.common.Mod.Init;
import cpw.mods.fml.common.event.FMLInitializationEvent;
@Mod(modid = "easyfps_Vz", name = "EasyFPS", version = "by Vazkii. Version [2.0.3] for 1.4.4/5")
public class mod_EasyFPS {
protected static boolean fpsEnabled = true; |
| File |
|---|
| mod_EasyFPS.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Annotation |