Conflict Solved

Merge branch 'Student-20374090' into dev
Student
1 changed files with 1 additions and 0 deletions
--- a/main.py
+++ b/main.py
@ -1,2 +1,3 @@
 import os
 os.system('python Function-20374249.py')
+
Author	SHA1	Message	Date
Liangff	fc5d51da1e	Conflict Solved	2 years ago
Liangff	52b279e1a4	Merge branch 'Student-20374090' into dev	2 years ago
Liangff	5513254954	Student	2 years ago