diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2018-03-01 23:27:31 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2018-03-01 23:27:31 +0000 |
commit | 257af80e45a833274e55bc25e5d19264435c99c4 (patch) | |
tree | d2dde44d79cd57e6c818404632d80247117cb4a6 /builds | |
parent | 5c4eace67f188da436b3b380a0125d053b29422a (diff) | |
parent | 77346c19555b3c5aa299e16c13af725feee220ec (diff) | |
download | gitlab-ce-257af80e45a833274e55bc25e5d19264435c99c4.tar.gz |
Merge branch 'sh-remove-trailing-lines' into 'master'
Remove trailing newline that was causing an EE conflict
See merge request gitlab-org/gitlab-ce!17465
Diffstat (limited to 'builds')
0 files changed, 0 insertions, 0 deletions