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/workspace.xml b/.idea/workspace.xml index 4d658fb..b89946a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -33,11 +33,11 @@