diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 03f298c..0000000 --- a/.idea/.name +++ /dev/null @@ -1,5 +0,0 @@ -<<<<<<< HEAD -parcing.py -======= -Work with driver.py ->>>>>>> origin/master diff --git a/.idea/22712.iml b/.idea/22712.iml index 74d515a..9e6c4ca 100644 --- a/.idea/22712.iml +++ b/.idea/22712.iml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index a971a2c..a6fa933 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4d658fb..4572841 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,7 +4,13 @@