summaryrefslogtreecommitdiff
path: root/lib/gitlab/conflict
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2016-08-04 14:56:54 +0100
committerFatih Acet <acetfatih@gmail.com>2016-08-12 23:24:48 +0300
commitf322c3027442b8f8c4800c19056bcd967be4018b (patch)
treef801759725828924773c02d0899fc4e3d2644471 /lib/gitlab/conflict
parent46f8e6421adc9e2e30c8c3f58fe0e00ae326f0c5 (diff)
downloadgitlab-ce-f322c3027442b8f8c4800c19056bcd967be4018b.tar.gz
Set flash message after conflict is resolved
Diffstat (limited to 'lib/gitlab/conflict')
0 files changed, 0 insertions, 0 deletions