Coflict Solved

2 years ago · eeca10aebd
parent 4e2090e174
commit eeca10aebd
1 changed files with 1 additions and 4 deletions
--- a/main.py
+++ b/main.py
@ -1,6 +1,3 @@
 import os
 <<<<<<< HEAD
 os.system('python Function-20231098.py')
-=======
+
 os.system('python Function-20231140.py')
 >>>>>>> 618b3e93d0b17ea718ae609c45ee2d68522a6e20