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