Conflict Solved

2 years ago · 418c126ff9
parent d9a337097a
commit 418c126ff9
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-21371427.py')
-=======
 os.system('python Function-21371434.py')
->>>>>>> eb19cf0a280dd1bfae38bbea315c6af03ada4c75