From eab5865a5c09ebef4db1d83f38d904a563267fc6 Mon Sep 17 00:00:00 2001
From: Shati Patel <42641846+shati-patel@users.noreply.github.com>
Date: Mon, 26 Apr 2021 12:38:58 +0100
Subject: [PATCH] Fix conflict in changelog

---
 extensions/ql-vscode/CHANGELOG.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md
index bbb0b4e2e..287643815 100644
--- a/extensions/ql-vscode/CHANGELOG.md
+++ b/extensions/ql-vscode/CHANGELOG.md
@@ -4,8 +4,6 @@
 
 - Copy version information to the clipboard when a user clicks the CodeQL section of the status bar. [#845](https://github.com/github/vscode-codeql/pull/845)
 - Ensure changes in directories that contain tests will be properly updated in the test explorer. [#846](https://github.com/github/vscode-codeql/pull/846)
-- Add a command to copy version information about the extension. [#845](https://github.com/github/vscode-codeql/pull/845)
-- Copy version information to the clipboard when a user clicks on the CodeQL section of the status bar. [#845](https://github.com/github/vscode-codeql/pull/845)
 
 ## 1.4.7 - 23 April 2021