# Conflicts: # README.md

7 years ago · 214ab37f04
--- a/README.md
+++ b/README.md
 
															
															 4. Build项目。菜单 Build => Make Project。
														
 
															
															 DONE.
														
 
															
															-DONE by John
														
 
															
															+Done by admin
														
--- a/test.txt
+++ b/test.txt
 
															
															+aaa