Conflict Solved

2 years ago · 76d3020b09
parent d6195402ca
commit 76d3020b09
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-21373067.py')
-=======
-os.system('python Function-21371101.py')     
->>>>>>> Student-21371101