From 122f1c8a28b52c60ffcaa233f5430172aba7635b Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Sun, 28 Jun 2020 23:56:27 +0300 Subject: [PATCH] Updated stack --- docker-compose.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 58b273c56c..ba3470822a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -52,11 +52,7 @@ services: - ./phpunit.xml:/usr/share/nginx/html/phpunit.xml - ./tests:/usr/share/nginx/html/tests - ./app:/usr/share/nginx/html/app -<<<<<<< HEAD - ./vendor:/usr/share/nginx/html/vendor -======= - # - ./vendor:/usr/share/nginx/html/vendor ->>>>>>> 8d92ee4e3e05cbacd87b1ef7282e599a36f56f77 - ./docs:/usr/share/nginx/html/docs - ./public:/usr/share/nginx/html/public - ./src:/usr/share/nginx/html/src