diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-07-29 14:51:11 +0100 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:44 +0300 |
| commit | f2f844693ecd8a10d48530adf8d59a7c125d2752 (patch) | |
| tree | bf5485f8c98722d92d381a4e6eedc03757cd197e /rubocop | |
| parent | 97ceadeea7b3ad9fa69049932149157334beba11 (diff) | |
| download | gitlab-ce-f2f844693ecd8a10d48530adf8d59a7c125d2752.tar.gz | |
Handle conflict resolution errors in controller
Diffstat (limited to 'rubocop')
0 files changed, 0 insertions, 0 deletions