diff --git a/.idea/misc.xml b/.idea/misc.xml index fe0b0da..f937d01 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2348fb0..e7fd9bc 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,7 +6,14 @@ +<<<<<<< HEAD +======= + + + + +>>>>>>> a954dc49f4c6943f06c97c50957ac1b1ac48088b