fix merge errors
This commit is contained in:
@ -24,7 +24,7 @@ import time
|
||||
|
||||
from secop.datatypes import StringType, FloatRange
|
||||
from secop.modules import Parameter, Property, Readable
|
||||
from secop.stringio import HasIodev, StringIO
|
||||
from secop.io import HasIodev, StringIO
|
||||
|
||||
|
||||
class LscIO(StringIO):
|
||||
|
Reference in New Issue
Block a user