From 8ffe73c7e3359e55dcca7b3cddc192e112a4affe Mon Sep 17 00:00:00 2001
From: Ted Unangst <tedu@tedunangst.com>
Date: Tue, 10 Dec 2019 18:14:50 -0500
Subject: [PATCH] fix merge

---
 docs/changelog.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.txt b/docs/changelog.txt
index b0a0cec..db0ad93 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -2,6 +2,8 @@ changelog
 
 === next
 
++ deluser command.
+
 + Configurable avatar colors.
 
 + Optional pleroma color scheme for the home sick...
@@ -34,8 +36,6 @@ changelog
 
 + Add cite tag for block quote attributions.
 
-+ deluser command.
-
 + @media print styles.
 
 + Disable overscroll (pull down) refresh.