diff --git a/.idea/1807c_git.iml b/.idea/1807c_git.iml deleted file mode 100644 index 9c14043a9ef99d93087d962b603b84d7149db1dc..0000000000000000000000000000000000000000 --- a/.idea/1807c_git.iml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 15a15b218a29e09c9190992732698d646e4d659a..0000000000000000000000000000000000000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 9034c30cc527f760e9004a9bd63a781cb1b63e75..0000000000000000000000000000000000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - -<<<<<<< HEAD - -======= - ->>>>>>> 5c149e7b2074b1bcd0400b0becf6ee5205358655 - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index b9796d491af2d6424856f8d1c1276353a05023d5..0000000000000000000000000000000000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f4cb416c083d265558da75d457237d671..0000000000000000000000000000000000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 9ccb140cdf079869a07c22c35a5fa53066518552..0000000000000000000000000000000000000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,388 +0,0 @@ - - -<<<<<<< HEAD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -