external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

small fix for javadoc

Browse Source
This commit is contained in:
jendave
2012-02-17 17:41:34 +00:00
parent 74eb192b53
commit b878693211
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/forge/model/FModel.java
View File

@@ -337,16 +337,10 @@ public class FModel {
} }
/** /**
<<<<<<< HEAD
* TODO: Needs to be reworked for efficiency with rest of prefs saves in codebase.
*
* @return a boolean.
=======
* TODO: Needs to be reworked for efficiency with rest of prefs saves in * TODO: Needs to be reworked for efficiency with rest of prefs saves in
* codebase. * codebase.
* *
* @return true, if successful * @return true, if successful
>>>>>>> Update Maven plugins. Checkstyle
*/ */
public final boolean savePrefs() { public final boolean savePrefs() {
final ForgePreferences fp = this.preferences; final ForgePreferences fp = this.preferences;
@@ -396,16 +390,10 @@ public class FModel {
} }
/** /**
<<<<<<< HEAD
* TODO: Needs to be reworked for efficiency with rest of prefs loads in codebase.
*
* @return a boolean.
=======
* TODO: Needs to be reworked for efficiency with rest of prefs loads in * TODO: Needs to be reworked for efficiency with rest of prefs loads in
* codebase. * codebase.
* *
* @return true, if successful * @return true, if successful
>>>>>>> Update Maven plugins. Checkstyle
*/ */
public final boolean loadPrefs() { public final boolean loadPrefs() {
final ForgePreferences fp = Singletons.getModel().getPreferences(); final ForgePreferences fp = Singletons.getModel().getPreferences();