summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-10-05 07:57:57 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2016-10-13 14:16:35 -0500
commit54bfe70795e289b86485b2a57d72b6711e4994bd (patch)
tree6cba31fce7354bd6f07daf31f057b6fa233e2589 /.gitlab-ci.yml
parentc4142cf9c0c0b217034c60a0a973d2e96b17a428 (diff)
downloadgitlab-ce-54bfe70795e289b86485b2a57d72b6711e4994bd.tar.gz
Add more tests to check conflicts resolution
Diffstat (limited to '.gitlab-ci.yml')
0 files changed, 0 insertions, 0 deletions