From 46aa2998a2d5c8ad03f9b0e30632c8c5e4e3cd15 Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Sun, 28 Feb 2021 20:25:22 +0300
Subject: [PATCH] changelog merging fix

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fff5edcc..bb64ed182 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -158,10 +158,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Security
 
 - Fixed the possibility of using file uploads to spoof posts.
-=======
-- Mix tasks for controlling user account confirmation status in bulk (`mix pleroma.user confirm_all` and `mix pleroma.user unconfirm_all`)
-- Mix task for sending confirmation emails to all unconfirmed users (`mix pleroma.email send_confirmation_mails`)
-- Mix task option for force-unfollowing relays
 
 ### Changed