From d03fd614d1bc161efa11405f48e10bb1e0cb4c9a Mon Sep 17 00:00:00 2001 From: Cristobal Belda-Perez Date: Thu, 7 Jun 2018 16:00:05 +0200 Subject: [PATCH] corrected typos --- dsf4docker/devonfw-cicd-environment/README.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dsf4docker/devonfw-cicd-environment/README.md b/dsf4docker/devonfw-cicd-environment/README.md index 2725d0d..ff30803 100644 --- a/dsf4docker/devonfw-cicd-environment/README.md +++ b/dsf4docker/devonfw-cicd-environment/README.md @@ -28,10 +28,3 @@ As well as for the installation, if we want to remove everything concerning **De Docker compose file using syntax 1.x Simply go to the directory `cd v1/` and run `docker-compose up -d` from there. -<<<<<<< HEAD -======= - -## Architecture overview - -![](../../readme/devonfw-shop-floor-docker-arch.png) ->>>>>>> d7a2b6010a2ede9b5872402f063df2d7be20d3c9