From b8786932111f0f40a4be87b7e5a5b4d24266ec4f Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Fri, 17 Feb 2012 17:41:34 +0000
Subject: [PATCH] small fix for javadoc

---
 src/main/java/forge/model/FModel.java | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/main/java/forge/model/FModel.java b/src/main/java/forge/model/FModel.java
index 6538f23792c..1900a0f8f26 100644
--- a/src/main/java/forge/model/FModel.java
+++ b/src/main/java/forge/model/FModel.java
@@ -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
      * codebase.
      *
      * @return true, if successful
->>>>>>> Update Maven plugins. Checkstyle
      */
     public final boolean savePrefs() {
         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
      * codebase.
      *
      * @return true, if successful
->>>>>>> Update Maven plugins. Checkstyle
      */
     public final boolean loadPrefs() {
         final ForgePreferences fp = Singletons.getModel().getPreferences();