test

2 years ago · eed3df83c0
parent f56308d12f
commit eed3df83c0
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-21371112.py')
-=======
-os.system('python Function-21371489.py')
->>>>>>> c2ed1daf4fc61d992ba340efac67c0354369a18b