diff --git a/README.md b/README.md index 884f519..010bfab 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,8 @@ # Supported tags and respective `Dockerfile` links -<<<<<<< HEAD -`stable` [*(bpodwinski/docker-phpservermon)*](https://github.com/bpodwinski/docker-phpservermon)
-`v3.3.0` [*(bpodwinski/docker-phpservermon/v3.3.0)*](https://github.com/bpodwinski/docker-phpservermon/tree/v3.3.0) -======= -`v3.3.1` [*(bpodwinski/docker-phpservermon/v3.3.1)*](https://github.com/bpodwinski/docker-phpservermon/tree/v3.3.1) ->>>>>>> 3.3.1 +`latest`, `stable` [*(bpodwinski/docker-phpservermon)*](https://github.com/bpodwinski/docker-phpservermon) +`3.3.0` [*(bpodwinski/docker-phpservermon/v3.3.0)*](https://github.com/bpodwinski/docker-phpservermon/tree/v3.3.0) +`3.3.1` [*(bpodwinski/docker-phpservermon/v3.3.1)*](https://github.com/bpodwinski/docker-phpservermon/tree/v3.3.1) ### What is this ?