Skip to content

GitLab

Commit 87f27e6c authored by Martin Reinecke's avatar Martin Reinecke
Browse files
Options

fix merge fallout

parent c97e6814
Pipeline #23338 passed with stage
    in 4 minutes and 33 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 0 additions and 1 deletion
    nifty/operators/scaling_operator.py
    View file @ 87f27e6c
    ......@@ -21,7 +21,6 @@ import numpy as np
    from ..field import Field
    from ..domain_tuple import DomainTuple
    from .endomorphic_operator import EndomorphicOperator
    from ..utilities import cast_iseq_to_tuple
    from .. import dobj
    ......
    Markdown is supported
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment