diff options
author | Stan Hu <stanhu@gmail.com> | 2019-03-04 22:33:37 -0800 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-03-04 22:33:37 -0800 |
commit | 997290fcba1058650390645d099a7245510470b6 (patch) | |
tree | 82ee35b138ef9e8b7da6a7100ecc82743f8b4743 /CHANGELOG.md | |
parent | 0fc51747b78c7cb3b590f29354fc236bfcb847f4 (diff) | |
download | gitlab-ce-997290fcba1058650390645d099a7245510470b6.tar.gz |
Resolve conflicts in spec/mailers/notify_spec.rb
Diffstat (limited to 'CHANGELOG.md')
0 files changed, 0 insertions, 0 deletions