From c4a261d881ffab159ff8cf87dd608bcca40d0008 Mon Sep 17 00:00:00 2001 From: dosse91 Date: Tue, 27 Jun 2017 16:06:57 +0200 Subject: [PATCH] Made a mess with the README --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index 5b46da2..b443d66 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,6 @@ Only modern browsers are supported (IE11, latest Edge, latest Chrome, latest Fir ## How to use in your site See the examples or doc.md -<<<<<<< HEAD ## Docker + Docker Compose The project includes a basic `docker-compose.yml` for development. To run, execute the following: @@ -44,10 +43,7 @@ $ docker build -t adolfintel/speedtest:latest . $ docker run -d --name speedtest -p 0.0.0.0:80:80 adolfintel/speedtest:latest ``` -======= -## Docker -Please see the ```docker``` branch ->>>>>>> master + ## Donate If you want to support this project, you can [send a donation via PayPal](https://www.paypal.me/sineisochronic).