Merge branch 'eurecom_ausf' of https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-ausf into eurecom_ausf

b8d9da8a · Tien-Thinh Nguyen · 4241f2df · 1bcc63fa · b8d9da8a
Commit b8d9da8a authored Jun 02, 2021 by Tien-Thinh Nguyen
Show 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 : #
+# RELEASE NOTES : #
-<<<<<<< HEAD
-##v1 .0.0 --Jun 2021##
-=======
-##vX.X.X-- YYY 2021##
->>>>>>> Initial Commit
+## v1 .0.0 --Jun 2021 ##
    * Initial release