From 2c44d8eb2aa6b018fc3700b8bc15f34402a55803 Mon Sep 17 00:00:00 2001 From: SamFerracin Date: Fri, 2 Feb 2024 10:35:26 -0500 Subject: [PATCH] changelog conflict --- .github/CHANGELOG.md | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 972177694..d3f312e76 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -107,38 +107,17 @@ which uses the old Numba code. When setting to a higher value, the new Julia cod --- -<<<<<<< HEAD # Release 0.6.1-post1 -======= -# Release 0.6.1-post1 (current release) - -### New features - - -### Breaking changes - ->>>>>>> 00cac30cff4129f5b906420814b5eba68eaf27e6 ### Improvements * Relaxes dependency versions in pyproject.toml. More specifically, this is to unpin scipy. [(#300)](https://github.com/XanaduAI/MrMustard/pull/300) -<<<<<<< HEAD ### Contributors [Filippo Miatto](https://github.com/ziofil), [Samuele Ferracin](https://github.com/SamFerracin), [Yuan Yao](https://github.com/sylviemonet), [Zeyue Niu](https://github.com/zeyueN) -======= -### Bug fixes - - -### Documentation - -### Contributors -[Filippo Miatto](https://github.com/ziofil), [Samuele Ferracin](https://github.com/SamFerracin), [Yuan Yao](https://github.com/sylviemonet), [Zeyue Niu](https://github.com/zeyueN) - ->>>>>>> 00cac30cff4129f5b906420814b5eba68eaf27e6 --- # Release 0.6.0