fix merge errors

This commit is contained in:
2021-09-21 16:58:29 +02:00
parent 8bbf65f6e8
commit 544e42033d
2 changed files with 2 additions and 10 deletions

View File

@ -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):