no message

src/ui/view/GUI.java

@@ -19,12 +19,9 @@ import javax.swing.JTable;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeCellRenderer;
 
-<<<<<<< HEAD
 import com.sun.javafx.TempState;
 import com.sun.xml.internal.bind.v2.TODO;
 
-=======
->>>>>>> 74d55e8294336055d94ca8c4ff6202168c94ea5d
 import ui.controller.Control;
 import ui.model.*;
 
@@ -164,9 +161,9 @@ public class GUI implements CategoryListener {
 		this.model = control.getModel();
 		this.canvas = new MyCanvas(model, control);
 		this.testgraph = new UnitGraph(model, control); // for testing, remove
-										
+
 		timePanel = new TimePanel(model, controller);
-				 
+
 		// later
 		control.initListener(this);
 		initialize();
@@ -662,7 +659,6 @@ public class GUI implements CategoryListener {
 		split_Graph_HolonEl.setTopComponent(scrollGraph);
 		split_Graph_HolonEl.setBottomComponent(scrollElements);
 
-		
 		frmCyberPhysical.getContentPane().add(timePanel, BorderLayout.SOUTH);
 	}
 

src/ui/view/Main.java

@@ -29,9 +29,6 @@ public class Main {
 					Model MODEL = new Model();
 					Control CONTROL = new Control(MODEL);
 					GUI VIEW = new GUI(CONTROL);
-					
-					
-					
 
 					VIEW.getFrmCyberPhysical().setVisible(true);