Merge conflict
Showing
docker/build/docker-tools/Dockerfile
0 → 100644
docker/plays/docker-tools.yml
0 → 100644
playbooks/edx-east/edx_service.yml
deleted
100644 → 0
playbooks/edx-east/edx_vpc.yml
deleted
100644 → 0
playbooks/library/git_2_0_1
deleted
100644 → 0
playbooks/library/systemd_2_2
deleted
100644 → 0
playbooks/roles/docker-tools/tasks/main.yml
0 → 100644
tests/jinja_check.py
deleted
100755 → 0
Please
register
or
sign in
to comment