mergebug

src/ui/controller/StoreController.java

@@ -20,10 +20,6 @@ import com.google.gson.stream.JsonWriter;
 
 import TypeAdapter.AbstractCpsObjectAdapter;
 import TypeAdapter.ColorAdapter;
-<<<<<<< HEAD
-=======
-
->>>>>>> f4856be8f5b4727747723ac10f9568abad338792
 import TypeAdapter.PositionAdapter;
 
 import classes.Category;