commit 53443dc7e4712fadea10be6d587c04d6ef7fbd4e Author: hiro hiro@torproject.org Date: Mon Dec 9 15:42:13 2019 +0100

Update vars --- playbooks/group_vars/all.yml | 9 --------- 1 file changed, 9 deletions(-)

diff --git a/playbooks/group_vars/all.yml b/playbooks/group_vars/all.yml index e5fc2c6..b8aed7a 100644 --- a/playbooks/group_vars/all.yml +++ b/playbooks/group_vars/all.yml @@ -1,20 +1,11 @@ --- gitlab_repo: https://salsa.debian.org/salsa/gitlab.git -<<<<<<< HEAD gitlab_version: v12.5.2-salsa-1 gitlab_pages_version: v1.12.0 gitlab_shell_version: v10.2.0 gitlab_workhorse_version: v8.14.1 gitaly_version: v1.72.1 gitlab_runner_version: v12.5.0 -======= -gitlab_version: v12.4.2-salsa-1 -gitlab_pages_version: v1.11.0 -gitlab_shell_version: v10.2.0 -gitlab_workhorse_version: v8.14.0 -gitaly_version: v1.67.0 -gitlab_runner_version: v12.4.1 ->>>>>>> Update from upstream docker_machine_version: v0.16.1 docker_registry_version: v2.7.1 minio_version: RELEASE.2018-07-23T18-34-49Z