diff options
author | Sean McGivern <sean@gitlab.com> | 2016-07-25 19:47:09 +0100 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:43 +0300 |
commit | df2ed097b730c8ba0b79cac8cc3dbfcb0cf587cb (patch) | |
tree | cf81b693a81e9bca1a5044706a4ba12c041bf55f /lib/uploaded_file.rb | |
parent | ff15fbf10c8c32fde876e5c9578fdc2161b7905c (diff) | |
download | gitlab-ce-df2ed097b730c8ba0b79cac8cc3dbfcb0cf587cb.tar.gz |
Add backend for merge conflicts reading
Diffstat (limited to 'lib/uploaded_file.rb')
0 files changed, 0 insertions, 0 deletions