diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1380845..2793bf6 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,13 +5,21 @@ -<<<<<<< HEAD - + -======= - ->>>>>>> refs/remotes/origin/master + + + + + + + + + + + + @@ -78,15 +78,15 @@ -<<<<<<< HEAD - @@ -99,14 +99,7 @@