trng201 - conflict.txt update post#38

jasonobermeyer wants to merge 1 commit intonanliu:masternanliu/git_learning:masterfrom

jasonobermeyer:trng201-conflictjasonobermeyer/git_learning:trng201-conflictCopy head branch name to clipboard