Skip to content

Commit b768038

Browse files
committed
Merge branch 'master' into develop
2 parents e73397f + 009c880 commit b768038

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

CHANGELOG.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## [Unreleased]
8+
## [v0.8.0] - 2022-10-18
99

1010
### Added
1111

@@ -18,7 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1818

1919
### Fixed
2020

21-
- Fixed installation on Apple Silicon with older Python versions (< 3.9)
21+
- Fixed installation on Apple Silicon with older Python versions (&lt; 3.9)
2222

2323
### Repository
2424

@@ -209,9 +209,19 @@ The ProjectQ v0.5.x release branch is the last one that is guaranteed to work wi
209209

210210
Future releases might introduce changes that will require Python 3.5 (Python 3.4 and earlier have already been declared deprecated at the time of this writing)
211211

212+
<<<<<<< HEAD
212213
[Unreleased]: https://github.com/ProjectQ-Framework/ProjectQ/compare/v0.7.3...HEAD
213214

214215
[v0.7.3]: https://github.com/ProjectQ-Framework/ProjectQ/compare/v0.7.2...v0.7.3
216+
||||||| 41e608d
217+
[Unreleased]: https://github.com/ProjectQ-Framework/ProjectQ/compare/v0.7.2...HEAD
218+
=======
219+
[Unreleased]: https://github.com/ProjectQ-Framework/ProjectQ/compare/v0.8.0...HEAD
220+
221+
[v0.8.0]: https://github.com/ProjectQ-Framework/ProjectQ/compare/v0.7.3...v0.8.0
222+
223+
[v0.7.3]: https://github.com/ProjectQ-Framework/ProjectQ/compare/v0.7.2...v0.7.3
224+
>>>>>>> master
215225
216226
[v0.7.2]: https://github.com/ProjectQ-Framework/ProjectQ/compare/v0.7.1...v0.7.2
217227

0 commit comments

Comments
 (0)