4

3 years ago · 7d607d4898
parent 90d676600e
commit 7d607d4898
1 changed files with 1 additions and 5 deletions
--- a/main.py
+++ b/main.py
@ -1,6 +1,2 @@
 import os
-<<<<<<< HEAD
-os.system('python Function-21371258.py')
-=======
-os.system('python Function-21371188.py')
->>>>>>> Student-21371188
+os.system('python Function-21371188.py')