scnc
/
qiskit-aer
mirror of https://github.com/Qiskit/qiskit-aer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Fixing remaining conflicts after merging with `master`

This commit is contained in:
Juan Gomez 2018-12-18 15:16:35 +01:00
parent 8e0d76f686
commit 8c8692a0a7
6 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
qiskit/providers/aer/aersimulatorerror.py
View File

2
qiskit/providers/aer/backends/unitary_simulator.py
View File

@ -14,7 +14,7 @@ Qiskit Aer Unitary Simulator Backend.
import logging
from math import log2, sqrt
from qiskit._util import local_hardware_info
from qiskit.backends.models import BackendConfiguration
from qiskit.providers.models import BackendConfiguration
from .aerbackend import AerBackend
from ..aererror import AerError

0
qiskit/providers/aer/noise/aernoiseerror.py
View File

0
qiskit/providers/aer/noise/noise_utils.py
View File

0
qiskit/providers/aer/noise/quantum_error.py
View File

0
qiskit/providers/aer/noise/readout_error.py
View File