From c3cf924ddd8017d2aff8c729b4207922459cf5e1 Mon Sep 17 00:00:00 2001
From: Dan <14043624+delivrance@users.noreply.github.com>
Date: Wed, 22 Aug 2018 10:32:57 +0200
Subject: [PATCH] Fix small merge issues

---
 pyrogram/client/methods/chats/get_dialogs.py  |  8 ++---
 .../client/methods/messages/send_animation.py | 30 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pyrogram/client/methods/chats/get_dialogs.py b/pyrogram/client/methods/chats/get_dialogs.py
index 8d9ad00f..13d46787 100644
--- a/pyrogram/client/methods/chats/get_dialogs.py
+++ b/pyrogram/client/methods/chats/get_dialogs.py
@@ -22,10 +22,10 @@ from ...ext import BaseClient, utils
 
 
 class GetDialogs(BaseClient):
-    def get_dialogs(self,
-                    offset_dialogs=None,
-                    limit: int = 100,
-                    pinned_only: bool = False):
+    async def get_dialogs(self,
+                          offset_dialogs=None,
+                          limit: int = 100,
+                          pinned_only: bool = False):
         """Use this method to get the user's dialogs
 
         You can get up to 100 dialogs at once.
diff --git a/pyrogram/client/methods/messages/send_animation.py b/pyrogram/client/methods/messages/send_animation.py
index ba68c77b..bd9cd0fd 100644
--- a/pyrogram/client/methods/messages/send_animation.py
+++ b/pyrogram/client/methods/messages/send_animation.py
@@ -27,21 +27,21 @@ from pyrogram.client.ext import BaseClient, utils
 
 
 class SendAnimation(BaseClient):
-    asyncdef send_animation(self,
-                 chat_id: int or str,
-                 animation: str,
-                 caption: str = "",
-                 parse_mode: str = "",
-                 duration: int = 0,
-                 width: int = 0,
-                 height: int = 0,
-                 thumb: str = None,
-                 disable_notification: bool = None,
-                 reply_to_message_id: int = None,
-                 reply_markup=None,
-                 progress: callable = None,
-                 progress_args: tuple = ()):
-        """Use this method to send animation files(animation or H.264/MPEG-4 AVC video without sound).
+    async def send_animation(self,
+                             chat_id: int or str,
+                             animation: str,
+                             caption: str = "",
+                             parse_mode: str = "",
+                             duration: int = 0,
+                             width: int = 0,
+                             height: int = 0,
+                             thumb: str = None,
+                             disable_notification: bool = None,
+                             reply_to_message_id: int = None,
+                             reply_markup=None,
+                             progress: callable = None,
+                             progress_args: tuple = ()):
+        """Use this method to send animation files (animation or H.264/MPEG-4 AVC video without sound).
 
         Args:
             chat_id (``int`` | ``str``):