From 197669c866f78aa97786b9c76a7e52cfb74729f0 Mon Sep 17 00:00:00 2001
From: dosse91 <dosse91@paranoici.org>
Date: Wed, 25 Sep 2019 09:23:12 +0200
Subject: [PATCH] Merged with master

---
 README.md | 52 ----------------------------------------------------
 1 file changed, 52 deletions(-)

diff --git a/README.md b/README.md
index 1433dd5..5946572 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # LibreSpeed (Node.js port)
 This is a nodeJS Port from the original PHP-based [LibreSpeed](https://github.com/librespeed/speedtest)
 
@@ -7,57 +6,6 @@ For any instructions and support please check out the [Wiki](https://github.com/
 
 ## Support
 If you like this project and want to support our work you can either do pull requests or donate via [PayPal](https://paypal.me/dunklesToast) 
-=======
-![LibreSpeed Logo](https://github.com/librespeed/speedtest/blob/master/.logo/logo3.png?raw=true)
-
-# LibreSpeed
-
-No Flash, No Java, No Websocket, No Bullshit.
-
-This is a very lightweight Speedtest implemented in Javascript, using XMLHttpRequest and Web Workers.
-
-## Try it
-[Take a Speedtest](https://speedtest.fdossena.com)
-
-## Compatibility
-All modern browsers are supported: IE11, latest Edge, latest Chrome, latest Firefox, latest Safari.  
-Works with mobile versions too.
-
-## Features
-* Download
-* Upload
-* Ping
-* Jitter
-* IP Address, ISP, distance from server (optional)
-* Telemetry (optional)
-* Results sharing (optional)
-* Multiple Points of Test (optional)
-
-![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
-
-## Installation videos
-* [Quick start installation guide for Ubuntu Server 19.04](https://fdossena.com/?p=speedtest/quickstart_v5_ubuntu.frag)
-
-## Android app
-A template to build an Android client for your LibreSpeed installation is available [here](https://github.com/librespeed/speedtest-android).
-
-## Docker
-Please see the `docker` branch
-
-## 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)  
->>>>>>> master
 
 ## License
 Copyright (C) 2016-2019 Federico Dossena