Conflict Solved

2 years ago · 577db57d4c
parent 3182329e43 1d2453fb4b
commit 577db57d4c
1 changed files with 4 additions and 0 deletions
--- a/main.py
+++ b/main.py
@ -1,2 +1,6 @@
 import os
+<<<<<<< HEAD
 os.system('python Function-20231100.py')
+=======
+os.system('python Function-20231098.py')
+>>>>>>> 1d2453fb4b6108999994e0367afed160d76c78c8