diff --git a/.idea/.name b/.idea/.name index 5d7fd94..03f298c 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1,5 @@ -parcing.py \ No newline at end of file +<<<<<<< HEAD +parcing.py +======= +Work with driver.py +>>>>>>> origin/master diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_15_02_2023_1_03_[Changes]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Update_at_15_02_2023_1_03_[Changes]/shelved.patch new file mode 100644 index 0000000..09a0bb9 --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Update_at_15_02_2023_1_03_[Changes]/shelved.patch @@ -0,0 +1,126 @@ +Index: .idea/workspace.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n 1675926797018\r\n \r\n \r\n 1675927078342\r\n \r\n \r\n 1675931967836\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n file://$PROJECT_DIR$/main.py\r\n 8\r\n \r\n \r\n \r\n \r\n +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/.idea/workspace.xml b/.idea/workspace.xml +--- a/.idea/workspace.xml ++++ b/.idea/workspace.xml +@@ -4,7 +4,7 @@ +