Fix conflicts for merging master -> dev

PennyLaneAI / qml

Introductions to key concepts in quantum programming, as well as tutorials and implementations from cutting-edge quantum computing research.

https://pennylane.ai/qml

Apache License 2.0

512 stars 182 forks source link

Closed doctorperceptron closed 1 month ago

doctorperceptron commented 1 month ago

The nightly merge of master back into dev has been failing for a week or so due to conflicts. This PR addresses those.

github-actions[bot] commented 1 month ago

Thank you for opening this pull request.

You can find the built site at this link.

Deployment Info:

Pull Request ID: 1108
Deployment SHA: 97fb890920964c36e8ce048c84ecf8aeb5c8b8f9 (The Deployment SHA refers to the latest commit hash the docs were built from)

Note: It may take several minutes for updates to this pull request to be reflected on the deployed site.