diff options
author | Sean McGivern <sean@gitlab.com> | 2016-07-29 14:49:48 +0100 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:44 +0300 |
commit | 97ceadeea7b3ad9fa69049932149157334beba11 (patch) | |
tree | 1600fae2596aa4461b44f0c39081a54eb8e264d0 /lib/event_filter.rb | |
parent | 7af277f683cd5ee0d5e3ffbc1dd3ce1d61f17848 (diff) | |
download | gitlab-ce-97ceadeea7b3ad9fa69049932149157334beba11.tar.gz |
Fix MR conflict resolution commits
Diffstat (limited to 'lib/event_filter.rb')
0 files changed, 0 insertions, 0 deletions