try

2 years ago · 7cb2cdee24
parent ba78800e98 241b0e4814
commit 7cb2cdee24
1 changed files with 3 additions and 9 deletions
--- a/main.py
+++ b/main.py
@ -1,13 +1,7 @@
 import os
-<<<<<<< HEAD
 os.system('python Function-21371345.py')
-
-
-
-~
-
-
-=======
 os.system('python Function-21373439.py')
 os.system('echo Feature-21373439')
->>>>>>> dev
+os.system('python Function-21373439.py')
+os.system('echo Feature-21373439')
+