fix merge

diff --git a/docs/api/differences_in_mastoapi_responses.md b/docs/api/differences_in_mastoapi_responses.md
index 88a43de383e0f9ccb215a972ca602f70c8ab26b1..623d4fbf55942f96f98e9fdef16e5ee369fcc834 100644 (file)
--- a/docs/api/differences_in_mastoapi_responses.md
+++ b/docs/api/differences_in_mastoapi_responses.md
@@ -90,7 +90,6 @@ Pleroma has mechanism that allows frontends to save blobs of json for each user
 The parameter should have a form of `{frontend_name: {...}}`, with `frontend_name` identifying your type of client, e.g. `pleroma_fe`. It will overwrite everything under this property, but will not overwrite other frontend's settings.
 
 This information is returned in the `verify_credentials` endpoint.
->>>>>>> develop
 
 ## Authentication