Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into remove_standalone
Browse files Browse the repository at this point in the history
  • Loading branch information
doichanj committed Aug 14, 2024
2 parents 1082ac9 + 2825e1f commit c04446e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions qiskit_aer/primitives/sampler.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
from qiskit.circuit import ParameterExpression, QuantumCircuit
from qiskit.compiler import transpile
from qiskit.exceptions import QiskitError
from qiskit.primitives import BaseSampler, SamplerResult
from qiskit.primitives import BaseSamplerV1, SamplerResult
from qiskit.primitives.utils import final_measurement_mapping, init_circuit
from qiskit.result import QuasiDistribution

from .. import AerSimulator


class Sampler(BaseSampler):
class Sampler(BaseSamplerV1):
"""
Aer implementation of Sampler class.
Expand Down

0 comments on commit c04446e

Please sign in to comment.