пре 8 година · 23fbd13115
--- a/bin/ui/controller/Control.class
+++ b/bin/ui/controller/Control.class
--- a/bin/ui/view/GUI$1.class
+++ b/bin/ui/view/GUI$1.class
--- a/bin/ui/view/GUI$2.class
+++ b/bin/ui/view/GUI$2.class
--- a/bin/ui/view/GUI$3.class
+++ b/bin/ui/view/GUI$3.class
--- a/bin/ui/view/GUI$4.class
+++ b/bin/ui/view/GUI$4.class
--- a/bin/ui/view/GUI$5.class
+++ b/bin/ui/view/GUI$5.class
--- a/bin/ui/view/GUI$6.class
+++ b/bin/ui/view/GUI$6.class
--- a/src/ui/controller/Control.java
+++ b/src/ui/controller/Control.java
@@ -92,13 +92,11 @@ public class Control {
 
				 			float energy) {
			
 
				 		objectController.addNewElementIntoCategoryObject(catName, objName, eleName, amount, energy);
			
 
				 	}
			
 
				-	
			
 
				-<<<<<<< HEAD
			
 
				-=======
			
 
				+
			
 
				 	public void deleteElement(){
			
 
				 		
			
 
				 	}
			
 
				->>>>>>> ea5ce1090a75c104d2cca9f0aa9dfc5b0bc08d01
			
 
				+
			
 
				 
			
 
				 	////////// etc
			
 
				 	/**