1

2 years ago · 1c7ec0ac62
parent d55ec75c29 8c09f6c757
commit 1c7ec0ac62
4 changed files with 4 additions and 6 deletions
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit 17e9fdbdf3330cdf084441aad96ba604ea968aed
--- a/Function-20376290.py
+++ b/Function-20376290.py
@ -0,0 +1 @@
+print('My Student_ID is 20376290')
--- a/main.py
+++ b/main.py
@ -1,6 +1,2 @@
-<<<<<<< HEAD
-
-=======
 import os
-os.system('python Function-20374236.py')
->>>>>>> student-20374236
+os.system('python Function-20376092.py')
--- a/2
+++ b/2
@ -0,0 +1,2 @@
+import os
+os.system("python Function-20376092.py")
				`@ -1 +0,0 @@`
				`Subproject commit 17e9fdbdf3330cdf084441aad96ba604ea968aed`