diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 97f0a8e..a75274a 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,6 +5,7 @@ +======= + diff --git a/.idea/misc.xml b/.idea/misc.xml index 051f733..a4e2f1f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,7 @@ +<<<<<<< Updated upstream @@ -18,4 +19,6 @@ +======= +>>>>>>> Stashed changes \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index d843f34..6b3243c 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,4 +1,10 @@ +<<<<<<< Updated upstream +======= + + + +>>>>>>> Stashed changes \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..afe4d73 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +