try

2 years ago · ba78800e98
parent 3151b2f846
commit ba78800e98
1 changed files with 5 additions and 0 deletions
--- a/main.py
+++ b/main.py
@ -1,4 +1,5 @@
 import os
+<<<<<<< HEAD
 os.system('python Function-21371345.py')


@ -6,3 +7,7 @@ os.system('python Function-21371345.py')
 ~


+=======
+os.system('python Function-21373439.py')
+os.system('echo Feature-21373439')
+>>>>>>> dev