Fix changelog merge conflict

# Conflicts: # CHANGELOG.md
2021-07-22 20:46:41 +00:00 · 2021-07-22 20:46:41 +00:00 · 179af131ee
commit 179af131ee
parent 6125dc885a 425919a0d2
10 changed files with 69 additions and 21 deletions
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -720,6 +720,7 @@
    "block": "Block",
    "blocked": "Blocked!",
    "deny": "Deny",
+    "edit_profile": "Edit profile",
    "favorites": "Favorites",
    "follow": "Follow",
    "follow_sent": "Request sent!",