diff --git a/Function-20374236.py b/Function-20374236.py index 0d072d1..29f1f3d 100644 --- a/Function-20374236.py +++ b/Function-20374236.py @@ -1 +1,2 @@ print('My Student_ID is 20374236') +print('My Name is cyx') diff --git a/main.py b/main.py index f345fdd..a1b357d 100644 --- a/main.py +++ b/main.py @@ -1,3 +1,8 @@ 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