Merge remote-tracking branch 'origin/develop' into eurecom_ausf

1bcc63fa · Raphael Defosseux · 1a78f69a · 93da5c30 · 1bcc63fa
Commit 1bcc63fa authored Jun 01, 2021 by Raphael Defosseux
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

CHANGELOG.md CHANGELOG.md +2 -7

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
-#RELEASE NOTES : #
-
-<<<<<<< HEAD
-##v1 .0.0 --Jun 2021##
-=======
-##vX.X.X-- YYY 2021##
->>>>>>> Initial Commit
+# RELEASE NOTES : #

+## v1 .0.0 --Jun 2021 ##
    * Initial release