diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2019-02-05 19:54:49 +0800 |
|---|---|---|
| committer | techknowlogick <matti@mdranta.net> | 2019-02-05 06:54:49 -0500 |
| commit | bf4badad1d68c18d7ffb92c69e09e4e8aa252935 (patch) | |
| tree | 9e8c3a41eba604738e632d921a2de97334e35e03 /modules/setting/setting.go | |
| parent | 680a57ce921f6d8c8752fa27aad6c95865fe8127 (diff) | |
| download | gitea-bf4badad1d68c18d7ffb92c69e09e4e8aa252935.tar.gz gitea-bf4badad1d68c18d7ffb92c69e09e4e8aa252935.zip | |
Pull request conflict files detection (#5951)
* add conflict detection
* test pull request conflict files
* fix detection files number
* fix comments
Diffstat (limited to 'modules/setting/setting.go')
0 files changed, 0 insertions, 0 deletions