Fixed changelog

5 years ago · 71b48ece76
parent 2c132012c2
commit 71b48ece76
1 changed files with 1 additions and 4 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -11,12 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 - Manual review pipeline: issues/comments/workspace (<https://github.com/openvinotoolkit/cvat/pull/2357>)
 - Added basic projects implementation (<https://github.com/openvinotoolkit/cvat/pull/2255>)
-<<<<<<< HEAD
- Tooltips in label selectors (<https://github.com/openvinotoolkit/cvat/pull/2509>)
-=======
 - Added documentation on how to mount cloud starage(AWS S3 bucket, Azure container, Google Drive) as FUSE (<https://github.com/openvinotoolkit/cvat/pull/2377>)
 - Added ability to work with share files without copying inside (<https://github.com/openvinotoolkit/cvat/pull/2377>)
->>>>>>> develop
+- Tooltips in label selectors (<https://github.com/openvinotoolkit/cvat/pull/2509>)

 ### Changed