From 71b48ece76121468667e8017b184171e391d6e9d Mon Sep 17 00:00:00 2001
From: Boris Sekachev <boris.sekachev@yandex.ru>
Date: Wed, 2 Dec 2020 12:30:05 +0300
Subject: [PATCH] Fixed changelog

---
 CHANGELOG.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aea017f1..e81da5a7 100644
--- 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