From: Maksim Pechnikov <parallel588@gmail.com>
Date: Tue, 4 Jun 2019 09:41:24 +0000 (+0300)
Subject: fix merge
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=96121315f3e9aebc57d36a669fc4003905cd0ba6;p=akkoma

fix merge
---

diff --git a/docs/api/differences_in_mastoapi_responses.md b/docs/api/differences_in_mastoapi_responses.md
index 88a43de38..623d4fbf5 100644
--- 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