Smalle merge mistake fixed

README.md

@@ -3,15 +3,7 @@ Before connecting the SPI-rack for the first time, install the drivers located
 in `drivers.zip`. On 64-bit systems run `SPI-Rack_x64`, on 32-bit systems
 run `SPI-Rack_x86`. This is only necessary on Windows systems.
 
-<<<<<<< HEAD
 Install the package using `pip install spirack`
 
 # Qcodes
 A Qcodes wrapper for the instrument is available from https://github.com/QCoDeS/Qcodes
-=======
-Install this package using `pip install spirack`
-
-# Qcodes
-
-A Qcodes wrapper for the instrument is available from https://github.com/QCoDeS/Qcodes
->>>>>>> origin/master

setup.py

@@ -29,11 +29,7 @@ def get_version(verbose=0):
       author_email='[email protected]',
       license='MIT',
       packages=['spirack'],
-<<<<<<< HEAD
       keywords = ['SPI', 'Qcodes', 'SPI-rack'],
-=======
-      keywords = ['SPI', 'Qcodes'],
->>>>>>> origin/master
       classifiers = [],
       install_requires=[
         'pyserial',