# Conflicts:
#	UnityGitTest/Assets/_Scene/场景测试.unity

# Conflicts:
#	UnityGitTest/Assets/_Scene/场景测试.unity

3 测试win和mac的更新

See merge request linyanghuan/git_test!8

第三次修改

See merge request linyanghuan/git_test!6

2 test merg

See merge request linyanghuan/git_test!5

更换主机测试

Closes #1

See merge request linyanghuan/git_test!4

# Conflicts:
#	README.md

重开议题提交

Closes #1

See merge request linyanghuan/git_test!3

Resolve "基础工作流演示测试"

Closes #1

See merge request linyanghuan/git_test!2