Oopsie whoopsie fix changelog

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10968d02b9c12146c1eec4d4896ab13eb63a62f0..dc1b4b6c707993c405bf3bd484538efcaf0dca30 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -141,13 +141,7 @@ switched to a new configuration mechanism, however it was not officially removed
 - Allow sending out emails again.
 - Allow sending chat messages to yourself
 - OStatus / static FE endpoints: fixed inaccessibility for anonymous users on non-federating instances, switched to handling per `:restrict_unauthenticated` setting.
-<<<<<<< HEAD
-- Mastodon API: Current user is now included in conversation if it's the only participant
-- Mastodon API: Fixed last_status.account being not filled with account data
-- See your own post when addressing a user from a blocked domain.
-=======
 - Fix remote users with a whitespace name.
->>>>>>> upstream/develop
 
 ### Upgrade notes