Conflict Solved

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