diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 9e4d601..3e7d9f0 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,7 +2,6 @@ - diff --git a/.idea/misc.xml b/.idea/misc.xml index c99d05a..e8f93bf 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,9 +1,4 @@ - - - - - - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 47af410..54a266b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,8 +7,13 @@ +<<<<<<< HEAD +======= + + +>>>>>>> d3130ef8cd7f2e24330f0fdefbf64b99d1f1a249