From 0d08ba730b474ae867950bf6a3630107e165ab37 Mon Sep 17 00:00:00 2001 From: Christian Korneck Date: Fri, 28 Aug 2020 10:15:11 +0200 Subject: [PATCH] Resolved merge conflict by incorporating both suggestions. --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index e75e1fa..7a03d41 100644 --- a/README.md +++ b/README.md @@ -443,14 +443,9 @@ Set up your GitHub Actions workflow with a specific version of your programming - [Monitor and limit your docker image size](https://github.com/wemake-services/docker-image-size-limit) - [Publish Docker Images to the Amazon Elastic Container Registry (ECR)](https://github.com/appleboy/docker-ecr-action) - [Build And Push Your Docker Images Caching Each Stage To Reduce Build Time](https://github.com/whoan/docker-build-with-cache-action) -<<<<<<< HEAD -- [Update a Container Repository Description From README.md](https://github.com/marketplace/actions/update-container-description-action) (Supported Registries: Docker Hub, Quay, Harbor) - -||||||| merged common ancestors -======= - [Set up Docker Buildx](https://github.com/crazy-max/ghaction-docker-buildx) - [Convert Branch or Tag Name Into Docker-Compatible Image Tag](https://github.com/ankitvgupta/ref-to-tag-action/) ->>>>>>> upstream/master +- [Update a Container Repository Description From README.md](https://github.com/marketplace/actions/update-container-description-action) (Supported Registries: Docker Hub, Quay, Harbor) #### Kubernetes