1 changed files with 0 additions and 5 deletions
--- a/main.py
+++ b/main.py
@ -1,8 +1,3 @@
 import os
-<<<<<<< HEAD
-os.system('python Function-21371192.py')
-os.system('echo Feature-21371192')
-=======
 os.system('python Function-21371434.py')
 os.system('echo Feature-21371434')
->>>>>>> dev