diff --git a/main.py b/main.py index 8a9e592..e232c4b 100644 --- a/main.py +++ b/main.py @@ -1,2 +1,6 @@ import os -os.system('python Function-21371427.py') \ No newline at end of file +<<<<<<< HEAD +os.system('python Function-21371427.py') +======= +os.system('python Function-21371434.py') +>>>>>>> eb19cf0a280dd1bfae38bbea315c6af03ada4c75