2 changed files with 0 additions and 6 deletions
--- a/Function-20374236.py
+++ b/Function-20374236.py
@ -1,2 +1 @@
 print('My Student_ID is 20374236')
-print('My Name is cyx')
--- a/main.py
+++ b/main.py
@ -1,8 +1,3 @@
 import os
-<<<<<<< HEAD
-os.system('python Function-20376399.py')
-os.system('echo Feature-20376399')
-=======
 os.system('python Function-20376092.py')
 os.system('echo Feature-20376092')
->>>>>>> 997cbdd719016e6df6f7d8e1c74c11f52e093c6b