Edgardo Palza 8 anni fa
parent
commit
d6aa6419c7
1 ha cambiato i file con 0 aggiunte e 3 eliminazioni
  1. 0 3
      src/ui/view/GUI.java

+ 0 - 3
src/ui/view/GUI.java

@@ -387,10 +387,7 @@ public class GUI<E> implements CategoryListener {
 						} else {
 							holonEleNamesDisplayed = ele.getEleName() + " ";
 						}
-<<<<<<< HEAD
-=======
 						unitGraph.repaintWithNewElement(selectedElements);
->>>>>>> 6a56b8b4607b7c38c67477e4f5c42a239c6b9a6d
 					}
 				} else if (ele != null) {
 					selectedElements.clear();