Remove duplicated GitLab-CI jobs.
commit1651271ae4200a83816db28aa43526134fc44b17
authorM. Eric Irrgang <ericirrgang@gmail.com>
Mon, 9 Mar 2020 12:43:49 +0000 (9 15:43 +0300)
committerM. Eric Irrgang <ericirrgang@gmail.com>
Mon, 9 Mar 2020 12:43:49 +0000 (9 15:43 +0300)
tree51254804d9238f200e5129bb500e1f77e806c70c
parent4b6f04b5abc42a957b1f5be33ab1eac2d82bec28
Remove duplicated GitLab-CI jobs.

Remove extra job definitions from merge conflict resolution error.

Fixes #3414

Change-Id: I39b36cef108db6c0274d163707303daea2391079
.gitlab-ci.yml