fix merge

.DS_Store

pulse_lib.egg-info/SOURCES.txt

pulse_lib/.DS_Store

pulse_lib/keysight/.DS_Store

pulse_lib/segments/__pycache__/__init__.cpython-37.pyc

pulse_lib/segments/__pycache__/data_classes.cpython-36.pyc

pulse_lib/segments/__pycache__/data_classes.cpython-37.pyc

...gments/__pycache__/data_handling_functions.cpython-37.pyc

pulse_lib/segments/__pycache__/looping.cpython-37.pyc

pulse_lib/segments/__pycache__/segments.cpython-37.pyc

pulse_lib/segments/__pycache__/segments_IQ.cpython-36.pyc

pulse_lib/segments/__pycache__/segments_IQ.cpython-37.pyc

pulse_lib/segments/__pycache__/segments_base.cpython-36.pyc

pulse_lib/segments/__pycache__/segments_base.cpython-37.pyc

pulse_lib/segments/data_classes/data_IQ.py

pulse_lib/segments/data_classes/data_generic.py

pulse_lib/segments/data_classes/data_pulse.py

pulse_lib/segments/segment_base.py

pulse_lib/segments/segment_pulse.py

pulse_lib/segments/utility/segments_c_func.c