Merge remote-tracking branch 'origin/master'

# Conflicts: # .idea/.name
2026-09-23 23:50:21 +00:00 · 2023-04-06 11:01:58 +03:00
parent 630a5c9fca 23639e3796
commit c4ddde097a
42 changed files with 392 additions and 9 deletions
@@ -1 +1,5 @@
-parcing.py
+<<<<<<< HEAD
+parcing.py
+=======
+Work with driver.py
+>>>>>>> origin/master
@@ -0,0 +1,4 @@
+<changelist name="Uncommitted_changes_before_Update_at_15_02_2023_1_03_[Changes]" date="1676412217607" recycled="false" toDelete="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_15_02_2023_1_03_[Changes]/shelved.patch" />
+  <option name="DESCRIPTION" value="Uncommitted changes before Update at 15.02.2023 1:03 [Changes]" />
+</changelist>