Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/Type_annoations_widgets_1' into …
Browse files Browse the repository at this point in the history
…Type_annoations_widgets_1

# Conflicts:
#	mantidimaging/gui/dialogs/cor_inspection/model.py
  • Loading branch information
ashmeigh committed Jul 16, 2024
2 parents 422b062 + 68df5ab commit cac56a4
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions mantidimaging/gui/dialogs/cor_inspection/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
from __future__ import annotations
from dataclasses import replace
from logging import getLogger
from typing import TYPE_CHECKING

if TYPE_CHECKING:
import numpy as np
import numpy as np

from mantidimaging.core.data import ImageStack
from mantidimaging.core.reconstruct import get_reconstructor_for
Expand Down

0 comments on commit cac56a4

Please sign in to comment.