README fix

README.md

@@ -1,17 +1,9 @@
-AnaFlow: A python-package containing analytical solutions for groundwater flow
-==============================================================================
-[![DOI](https://zenodo.org/badge/116264578.svg)](https://zenodo.org/badge/latestdoi/116264578)
-<<<<<<< HEAD
-
-<p align="center">
-<img src="/docs/source/Anaflow.png" alt="AnaFlow-LOGO" width="251px"/>
-</p>
 
-You can find the documentation under: http://anaflow.readthedocs.io
-=======
+AnaFlow: A python-package containing analytical solutions for the groundwater flow equation
+===========================================================================================
+[![DOI](https://zenodo.org/badge/116264578.svg)](https://zenodo.org/badge/latestdoi/116264578)
 [![PyPI version](https://badge.fury.io/py/anaflow.svg)](https://badge.fury.io/py/anaflow)
 [![Documentation Status](https://readthedocs.org/projects/docs/badge/?version=latest)](https://anaflow.readthedocs.io/en/latest/)
->>>>>>> 6d35523d596e8942c004c35a101a86f83584f18d
 
 Contents
 --------
@@ -42,14 +34,8 @@ For example: ``import anaflow.helper``
 
 Installation
 ------------
-AnaFlow is on [PyPI](https://pypi.org/project/anaflow/). You just need to run
-the following command:
-
-    pip install -U anaflow
-
-If you want the latest version, just download the
-[code](https://github.com/MuellerSeb/AnaFlow/archive/master.zip)
-and run the following command from the source code directory:
+Just download the code an run the following command from the
+source code directory:
 
     pip install -U .
 
@@ -58,24 +44,8 @@ for sparse linear systems:
 
     pip install -U scikit-umfpack
 
-Under Ubuntu you can install the required SuiteSparse library with:
-
-    sudo apt-get install libsuitesparse-dev
-
-For further information have a look at:
- - http://pypi.python.org/pypi/scikit-umfpack
- - http://faculty.cse.tamu.edu/davis/suitesparse.html
-
-Dependencies
-------------
- - [NumPy](http://www.numpy.org): 1.10.0 or higher
- - [SciPy](http://www.scipy.org): 0.19.0 or higher
- - [scikit-umfpack](http://pypi.python.org/pypi/scikit-umfpack): recomended
+Have a look at: https://pypi.python.org/pypi/scikit-umfpack
 
-<<<<<<< HEAD
-Created December 2017, Copyright Sebastian Mueller 2017-2018
-=======
 [![ForTheBadge built-with-science](http://ForTheBadge.com/images/badges/built-with-science.svg)](https://GitHub.com/Naereen/)
 
 Created December 2017, Copyright Sebastian Mueller 2017
->>>>>>> 6d35523d596e8942c004c35a101a86f83584f18d