瀏覽代碼

Bad Merge one more time

Edgardo Palza 8 年之前
父節點
當前提交
45639b42f1
共有 1 個文件被更改,包括 0 次插入4 次删除
  1. 0 4
      src/ui/view/GUI.java

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

@@ -311,13 +311,9 @@ public class GUI implements CategoryListener {
 					addElementPopUp = new AddElementPopUp();
 					addElementPopUp.setVisible(true);
 					controller.addElementCanvasObject(tempCpsObject.getID(), addElementPopUp.getElement().getEleName(),
-<<<<<<< HEAD
 							addElementPopUp.getElement().getAmount(), addElementPopUp.getElement().getEnergy());
 					refreshTableHolonElement();
 					refreshTableProperties();
-=======
-							addElementPopUp.getElement().getAmount(), addElementPopUp.getElement().getEnergy());
->>>>>>> 0f43b0360afad6c157dc5a3e37fe5de97ec95f7f
 				}
 			}
 		});