Skip to content

Commit

Permalink
fix: wrong merge
Browse files Browse the repository at this point in the history
  • Loading branch information
stavros11 committed Mar 20, 2024
1 parent d6b6a9e commit 0725bc1
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/qibolab/platform.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""A platform for executing quantum algorithms."""

import copy
from collections import defaultdict
from dataclasses import dataclass, field, replace
Expand All @@ -10,7 +11,7 @@
from .couplers import Coupler
from .execution_parameters import ExecutionParameters
from .instruments.abstract import Controller, Instrument, InstrumentId
from .pulses import Drag, FluxPulse, PulseSequence, ReadoutPulse
from .pulses import Drag, PulseSequence, PulseType
from .qubits import Qubit, QubitId, QubitPair, QubitPairId
from .sweeper import Sweeper
from .unrolling import batch
Expand Down

0 comments on commit 0725bc1

Please sign in to comment.