Conflict Solved

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