Conflict Solved

2 years ago · d9a337097a
parent fe7ed5cac3 eb19cf0a28
commit d9a337097a
1 changed files with 5 additions and 1 deletions
--- a/main.py
+++ b/main.py
@ -1,2 +1,6 @@
 import os
+<<<<<<< HEAD
 os.system('python Function-21371427.py')
+=======
+os.system('python Function-21371434.py')
+>>>>>>> eb19cf0a280dd1bfae38bbea315c6af03ada4c75