合并请求喵喵喵 #13

Merged

buaa21371434 merged 2 commits from buaa21371192/mylab:Feature-21371192 into dev

1 changed files with 5 additions and 0 deletions

										
											5

main.py

										Unescape
										Escape
									
											View File
										
					@ -1,3 +1,8 @@

					import os

					import os

					<<<<<<< HEAD

					os.system('python Function-21371192.py')

					os.system('echo Feature-21371192')

					=======

					os.system('python Function-21371434.py')

					os.system('python Function-21371434.py')

					os.system('echo Feature-21371434')

					os.system('echo Feature-21371434')

					>>>>>>> dev