Lunny Xiao bf4badad1d Pull request conflict files detection (#5951) ... * add conflict detection * test pull request conflict files * fix detection files number * fix comments		2019-02-05 06:54:49 -05:00
..
gitignore
label
license
locale	Pull request conflict files detection (#5951)	2019-02-05 06:54:49 -05:00
readme