diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2f82d47..736c1d3 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -29,7 +29,11 @@ ======= +<<<<<<< HEAD +>>>>>>> modzeleg +======= + >>>>>>> modzeleg