2

2 years ago · e7d8a51983
parent ef82215ace
commit e7d8a51983
1 changed files with 0 additions and 3 deletions
--- a/main.py
+++ b/main.py
@ -1,5 +1,2 @@
-<<<<<<< HEAD
-=======
 import os
 os.system('python Function-20231098.py')
->>>>>>> student-20231098