From 1c7f5e2fc8e535d09e66d53ae5cb6f3d96d5b508 Mon Sep 17 00:00:00 2001 From: mtiggelman Date: Thu, 1 Jun 2017 09:53:20 +0200 Subject: [PATCH] Smalle merge mistake fixed --- README.md | 8 -------- setup.py | 4 ---- 2 files changed, 12 deletions(-) diff --git a/README.md b/README.md index a6b68bc..71b64dc 100644 --- a/README.md +++ b/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 diff --git a/setup.py b/setup.py index 04f8ca3..db1c782 100644 --- a/setup.py +++ b/setup.py @@ -29,11 +29,7 @@ def get_version(verbose=0): author_email='qutechdev@gmail.com', license='MIT', packages=['spirack'], -<<<<<<< HEAD keywords = ['SPI', 'Qcodes', 'SPI-rack'], -======= - keywords = ['SPI', 'Qcodes'], ->>>>>>> origin/master classifiers = [], install_requires=[ 'pyserial',