diff --git a/.idea/vcs.xml b/.idea/vcs.xml index b465b7e..b64f185 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -3,5 +3,6 @@ + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 67e726b..245def7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,35 @@ +<<<<<<< HEAD + + + + + + + + + + + + + + + + + + + + + + + +