summaryrefslogtreecommitdiff
path: root/doc/gitlab-basics/add-merge-request.md
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-06-13 12:05:52 +0100
committerFilipa Lacerda <filipa@gitlab.com>2018-06-13 12:05:52 +0100
commit83397ed0713d7d1c950f973b28ed4df7c8cc7185 (patch)
treedb416782557cd1e989eeca93688581d1e8de422b /doc/gitlab-basics/add-merge-request.md
parente29c0da8c567fa884d8ceca05346fa7635e1eb8d (diff)
downloadgitlab-ce-83397ed0713d7d1c950f973b28ed4df7c8cc7185.tar.gz
Fix broken tests due to bad conflict resolution
Diffstat (limited to 'doc/gitlab-basics/add-merge-request.md')
0 files changed, 0 insertions, 0 deletions