diff --git a/main.py b/main.py index aa73295..f28c86c 100644 --- a/main.py +++ b/main.py @@ -1,2 +1,6 @@ import os -os.system('python Function-21373067.py') \ No newline at end of file +<<<<<<< HEAD +os.system('python Function-21373067.py') +======= +os.system('python Function-21371101.py') +>>>>>>> Student-21371101