Skip to content

Commit

Permalink
Merge 0e948d9 into 1698b3a
Browse files Browse the repository at this point in the history
  • Loading branch information
CatherineH committed Aug 14, 2016
2 parents 1698b3a + 0e948d9 commit b2ac310
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 4 deletions.
2 changes: 0 additions & 2 deletions instruments/phasematrix/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
Module containing Phase Matrix instruments
"""


from __future__ import absolute_import

from .phasematrix_fsw0020 import PhaseMatrixFSW0020

1 change: 0 additions & 1 deletion instruments/picowatt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@
from __future__ import absolute_import

from .picowattavs47 import PicowattAVS47

1 change: 0 additions & 1 deletion instruments/yokogawa/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@
from __future__ import absolute_import

from .yokogawa7651 import Yokogawa7651

0 comments on commit b2ac310

Please sign in to comment.