mirror of
https://github.com/KUlishevgeniy/c22712.git
synced 2026-09-24 08:00:22 +00:00
Merge remote-tracking branch 'origin/master'
# Conflicts: # .idea/.name
This commit is contained in:
Generated
+5
-1
@@ -1 +1,5 @@
|
||||
parcing.py
|
||||
<<<<<<< HEAD
|
||||
parcing.py
|
||||
=======
|
||||
Work with driver.py
|
||||
>>>>>>> origin/master
|
||||
|
||||
Reference in New Issue
Block a user