Merge problem

src/classes/CpsEdge.java

@@ -108,24 +108,15 @@ public class CpsEdge {
 		 * isWorking = false; state = false; }
 		 **/
 	}
-<<<<<<< HEAD
 
 	/**
 	 * Calculates the state of the edge (see description of isWorking)
 	 * 
 	 * @param simMode
 	 */
+
 	public void calculateState(boolean simMode) {
 		if (flow > maxCapacity && maxCapacity != -1) {
-=======
-	
-	/**
-	 * calculates wether isWorking or not
-	 * @param simMode
-	 */
-	public void calculateState(boolean simMode){
-		if(flow > maxCapacity && maxCapacity != -1){
->>>>>>> 0f397a62123e10fe88ef0d9ee68b3db6c0201ec8
 			isWorking = false;
 		} else {
 			if (!simMode && flow <= maxCapacity) {

src/classes/CpsObject.java

@@ -233,20 +233,18 @@ public abstract class CpsObject {
 	}
 
 	/**
-<<<<<<< HEAD
-	 * Set the colorof the border
-	 * 
-=======
 	 * Set the Border Color of this CpsObject
 	 * 
-	 * @param the BorderColor
+	 * @param the
+	 *            BorderColor
 	 */
 	public void setBorderColor(Color c) {
 		this.BorderColor = c;
 	}
 
 	/**
->>>>>>> 0f397a62123e10fe88ef0d9ee68b3db6c0201ec8
+	 * Set the Color of the edges
+	 * 
 	 * @param Color
 	 *            the Color to set
 	 */
@@ -254,36 +252,27 @@ public abstract class CpsObject {
 		this.BorderColor = color;
 	}
 
-<<<<<<< HEAD
 	/**
 	 * For internal purpose (energy flow)
 	 * 
 	 * @param tag
 	 */
-=======
->>>>>>> 0f397a62123e10fe88ef0d9ee68b3db6c0201ec8
 	public void addTag(int tag) {
 		this.tags.add(tag);
 	}
 
-<<<<<<< HEAD
 	/**
 	 * Get the actual tags
 	 * 
 	 * @return ArrayList
 	 */
-=======
->>>>>>> 0f397a62123e10fe88ef0d9ee68b3db6c0201ec8
 	public ArrayList<Integer> getTag() {
 		return tags;
 	}
 
-<<<<<<< HEAD
 	/**
-	 * Reste the tags to Null
+	 * Rest the tags to Null
 	 */
-=======
->>>>>>> 0f397a62123e10fe88ef0d9ee68b3db6c0201ec8
 	public void resetTags() {
 		this.tags = new ArrayList<Integer>();
 	}