Revert "fix errors merge"

This reverts commit ce27cbe.

SpagoBIDAO/src/main/java/it/eng/spagobi/behaviouralmodel/lov/bo/FixedListDetail.java

@@ -24,6 +24,8 @@
 import it.eng.spagobi.utilities.assertion.Assert;
 import it.eng.spagobi.utilities.exceptions.SpagoBIRuntimeException;
 import it.eng.spagobi.utilities.objects.Couple;
+<<<<<<<
+=======
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -36,6 +38,16 @@
 
 import org.apache.log4j.Logger;
 
+>>>>>>>
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.log4j.Logger;
+
 /**
  * Defines method to manage lov of fixed list type
  */
@@ -268,6 +280,8 @@ public String getLovResult(IEngUserProfile profile, List<ObjParuse> dependencies
 			String value = lov.getValue();
 			String description = lov.getDescription();
 			lovResult += "<ROW" + " VALUE=\"" + value + "\"" + " DESCRIPTION=\"" + description + "\"" + "/>";
+<<<<<<<
+=======
 		}
 		lovResult += "</ROWS>";
 		lovResult = StringUtilities.substituteProfileAttributesInString(lovResult, profile);
@@ -280,6 +294,13 @@ public String getLovResult(IEngUserProfile profile, List<ObjParuse> dependencies
 		return lovResult;
 	}
 
+>>>>>>>
+		}
+		lovResult += "</ROWS>";
+		lovResult = StringUtilities.substituteProfileAttributesInString(lovResult, profile);
+		return lovResult;
+	}
+
 	/**
 	 * Method returns result of the defined LOV of type fixed list as data store.
 	 * */
@@ -381,6 +402,8 @@ public List getProfileAttributeNames() throws Exception {
 			lovResult = lovResult.substring(endind);
 		}
 		return names;
+<<<<<<<
+=======
 	}
 
 	/**
@@ -411,6 +434,13 @@ public Set<String> getParameterNames() throws Exception {
 		return names;
 	}
 
+	/**
+	 * Checks if the lov requires one or more profile attributes.
+	 *
+	 * @return true if the lov require one or more profile attributes, false otherwise
+>>>>>>>
+	}
+
 	/**
 	 * Checks if the lov requires one or more profile attributes.
 	 *