From f5cee6d03d6b65be93f8fc965a09f6a287f2251f Mon Sep 17 00:00:00 2001
From: dosse91 <dosse91@paranoici.org>
Date: Mon, 1 Jul 2019 21:01:46 +0200
Subject: [PATCH] Fixed README disaster

---
 .README.md.kate-swp | Bin 590 -> 0 bytes
 README.md           |  37 +------------------------------------
 2 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 .README.md.kate-swp

diff --git a/.README.md.kate-swp b/.README.md.kate-swp
deleted file mode 100644
index b0274cc0795c94dea75f652b0488e26bfc0c12a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 590
zcmYL_%}PQ+6oAhzglZunk=N^#KdDzOTBvDy+guU)fx1M?5ONW?5DEmL7w8FkfO>{D
zEnBu|+bVjK=9_z@f%)$F=FFXQW<(@?GJcqtcs`z);oWp%4x0NSvhne?cz&N|M?W{8
z-@~Wh)Z_i@OMGcF4LccYNZo}ZArh#hk($aDQc<}@$|~nbN#z<Ts$3ui6%W}_S-rBs
z9%zCFsDl91KowNLE+~T%D1t&1^9dq%7ur9w^X*?xSxU5RLx!P)mJ3BT`Mm?$pp|S5
zHM?NzK*ha7UuB(4PsK;NDk-F+GDnt$Gsv>=3gwPL2nL`JjzAA|!68T*Ozx^J8oSKM
iacJI!BJSCJl`5H>$_VjPGMu>$49Ei?<bapd$wq&A3OjQE

diff --git a/README.md b/README.md
index c4d07a9..6043945 100644
--- a/README.md
+++ b/README.md
@@ -25,26 +25,6 @@ Works with mobile versions too.
 
 ![Screenshot](https://speedtest.fdossena.com/mpot_v5.gif)
 
-
-## Server requirements
-* A reasonably fast web server with Apache 2 (nginx, IIS also supported)
-* PHP 5.4 (other backends also available)
-* MySQL database to store test results (optional, PostgreSQL and SQLite also supported)
-* A fast! internet connection
-
-<<<<<<< HEAD
-## Quick installation videos
-* [Debian 9.0 with Apache](https://fdossena.com/?p=speedtest/quickstart_deb.frag)
-* [Windows Server 2016 with IIS](https://fdossena.com/?p=speedtest/quickstart_win.frag)
-* [Ubuntu (External)](https://freedif.org/how-to-install-selfhosted-speedtest)
-
-Also, here's an [example config on Ubuntu 16 LTS](https://github.com/adolfintel/speedtest/issues/50)
-
-## How to use in your site
-* See the examples
-* [Read the wiki](https://github.com/adolfintel/speedtest/wiki)
-* Read doc.md
-
 ## Docker + Docker Compose
 
 The project includes a basic `docker-compose.yml` for development.  To run, execute the following:
@@ -55,8 +35,7 @@ $ docker-compose build
 $ docker-compose up
 ```
 
-
-Speedtest will be available at [http://0.0.0.0:8888/](http://0.0.0.0:8888/).  You can try out all of the examples via their associated urls (i.e. `http://0.0.0.0:8888/example1.html`).
+Speedtest will be available at [http://0.0.0.0:8888/](http://0.0.0.0:8888/).
 
 To run via Docker directly:
 
@@ -66,20 +45,6 @@ $ docker build -t adolfintel/speedtest:latest .
 $ docker run -d --name  speedtest -p 0.0.0.0:80:80 adolfintel/speedtest:latest
 ```
 
-## Multiple test servers
-Please see the ```mpot``` branch
-
-=======
-## Installation videos
-* [Quick start installation guide for Ubuntu Server 19.04](https://fdossena.com/?p=speedtest/quickstart_v5_ubuntu.frag)
-
-## Docker
-Please see the `docker` branch
-
->>>>>>> master
-## Node.js backend
-A Node.js implementation is available in the `node` branch, maintained by [dunklesToast](https://github.com/dunklesToast).
-
 ## Donate
 [![Donate with Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/fdossena/donate)  
 [Donate with PayPal](https://www.paypal.me/sineisochronic)