summaryrefslogtreecommitdiff
path: root/scripts/lint-conflicts.sh
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-05-221-1/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-02-041-1/+1
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-12-101-1/+1
* Make sure we didn't commit conflictsLin Jen-Shin (godfat)2017-08-011-0/+5