From 12aa99ad50a655f2c0e54b7401adc8fa3f90ded8 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 18 Jan 2022 16:04:03 +0100
Subject: [PATCH] Changes: correct conflict marker and remove reverted removal

---
 CHANGELOG | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 047acb10d..aaa3d569a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,5 @@
 Version 3.2.0
     * not released yet
-<<<<<<< HEAD
     * Add support for Screen Capture (Qt 5.13.2+)
     * Option for internal PDFium-based viewer (Qt 5.13+)
     * CookieManager: Add support for selecting more than one cookie at once
@@ -38,8 +37,6 @@ Version 3.2.0
     * VerticalTabs: Corectly recognize tree collapse / expand button
     * VerticalTabs: Also override Ctrl+PgUp/PgDown shortcuts
 
-    * Remove GnomeKeyringPasswords plugin
-
 Version 3.1.0
     * released 19 March 2019
     * add support for writing plugins in QML