From 38274de75028a2933c6dbb4f86651925376ef30f Mon Sep 17 00:00:00 2001
From: shekhar-cis <shekhar.c@cisinlabs.com>
Date: Tue, 30 Aug 2022 12:37:23 +0530
Subject: [PATCH] Fix conflicts

---
 src/bitmessagekivy/mpybit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bitmessagekivy/mpybit.py b/src/bitmessagekivy/mpybit.py
index 761c2ad6..51e311e3 100644
--- a/src/bitmessagekivy/mpybit.py
+++ b/src/bitmessagekivy/mpybit.py
@@ -1,6 +1,6 @@
 # pylint: disable=unused-import, too-many-public-methods, unused-variable, too-many-ancestors
 # pylint: disable=no-name-in-module, too-few-public-methods, import-error, unused-argument
-# pylint: disable=attribute-defined-outside-init, global-variable-not-assigned
+# pylint: disable=attribute-defined-outside-init, global-variable-not-assigned, too-many-instance-attributes
 
 """
 Bitmessage android(mobile) interface