Update README.md

README.md

-<<<<<<< HEAD
 ##This is the privacyIDEA-PHP-SDK.
 
 This library will help you to connect your plugin to the privacyIDEA server using REST APIs.
@@ -12,8 +11,3 @@ To do it with Composer simply copy that line to your terminal in your project di
 
 Remember that you have to install composer first. If you will know how to do it, check this documentation:
 https://getcomposer.org/doc/00-intro.md
-
-##
-=======
-# sdk-php
->>>>>>> 0fa31f30d5b9a155885cd53bac2ce61c40991841