fix merge

.gitignore

...se_lib/keysight/uploader_core/uploader.cp36-win_amd64.pyd

...ulse_lib/segments/data_classes_markers.cp36-win_amd64.pyd

...3.6/pulse_lib/segments/segments_c_func.cp36-win_amd64.pyd

...uploader_core/keysight_awg_post_processing_and_upload.obj

...3.6/Release/pulse_lib/keysight/uploader_core/mem_ctrl.obj

...se_lib/keysight/uploader_core/uploader.cp36-win_amd64.exp

...se_lib/keysight/uploader_core/uploader.cp36-win_amd64.lib

...3.6/Release/pulse_lib/keysight/uploader_core/uploader.obj

...ulse_lib/segments/data_classes_markers.cp36-win_amd64.exp

...ulse_lib/segments/data_classes_markers.cp36-win_amd64.lib

...4-3.6/Release/pulse_lib/segments/data_classes_markers.obj

...ase/pulse_lib/segments/segments_c_func.cp36-win_amd64.exp

...ase/pulse_lib/segments/segments_c_func.cp36-win_amd64.lib

...-amd64-3.6/Release/pulse_lib/segments/segments_c_func.obj

dist/pulse_lib-1.1-py3.6-win-amd64.egg

dist/pulse_lib-1.1-py3.7-linux-x86_64.egg

dist/pulse_lib-1.1-py3.7-macosx-10.14-x86_64.egg

docs/_build/doctrees/autodoc/base_pulse.doctree

docs/_build/doctrees/autodoc/segment.doctree