DOC : patch up merge conflicts in docstring
DOC : patch up merge conflicts in docstring

ericdill/datamuxer,NSLS-II/datamuxer,NSLS-II/dataportal,ericdill/datamuxer,NSLS-II/dataportal,ericdill/databroker,tacaswell/dataportal,danielballan/dataportal,danielballan/datamuxer,danielballan/dataportal,danielballan/datamuxer,ericdill/databroker,tacaswell/dataportal