Merge branch 'master' into master

jaygambetta · web-flow · commit f15546be84ea · 2019-10-19T22:23:13.000-04:00
diff --git a/qiskit/advanced/aer/1_aer_provider.ipynb b/qiskit/advanced/aer/1_aer_provider.ipynb
@@ -55,7 +55,7 @@
     "* `StatevectorSimulator`: Allows ideal single-shot execution of qiskit circuits and returns the final statevector of the simulator after application\n",
     "* `UnitarySimulator`: Allows ideal single-shot execution of qiskit circuits and returns the final unitary matrix of the circuit itself. Note that the circuit cannot contain measure or reset operations for this backend\n",
     "\n",
-    "These backends are found in the `Aer` provider with the names `qasm_simulstor`, `statevector_simulator` and `unitary_simulator`, respectively."
+    "These backends are found in the `Aer` provider with the names `qasm_simulator`, `statevector_simulator` and `unitary_simulator`, respectively."
    ]
   },
   {

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@`
`55`	`55`	"* `StatevectorSimulator`: Allows ideal single-shot execution of qiskit circuits and returns the final statevector of the simulator after application\n",
`56`	`56`	"* `UnitarySimulator`: Allows ideal single-shot execution of qiskit circuits and returns the final unitary matrix of the circuit itself. Note that the circuit cannot contain measure or reset operations for this backend\n",
`57`	`57`	`"\n",`
`58`		- "These backends are found in the `Aer` provider with the names `qasm_simulstor`, `statevector_simulator` and `unitary_simulator`, respectively."
	`58`	+ "These backends are found in the `Aer` provider with the names `qasm_simulator`, `statevector_simulator` and `unitary_simulator`, respectively."
`59`	`59`	`]`
`60`	`60`	`},`
`61`	`61`	`{`