From 66de416627b75090687710ee69113ea20743f1c1 Mon Sep 17 00:00:00 2001
From: lakshyacis <lakshya.p@cisinlabs.com>
Date: Mon, 30 Sep 2019 19:57:08 +0530
Subject: [PATCH] fixes after conflicts

---
 src/bitmessagekivy/mpybit.py | 3 +--
 src/messagetypes/vote.py     | 2 --
 src/pyelliptic/openssl.py    | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/bitmessagekivy/mpybit.py b/src/bitmessagekivy/mpybit.py
index 518c227e..7f3da132 100644
--- a/src/bitmessagekivy/mpybit.py
+++ b/src/bitmessagekivy/mpybit.py
@@ -49,7 +49,6 @@ from kivymd.navigationdrawer import (
     MDNavigationDrawer,
     NavigationDrawerHeaderBase)
 from kivymd.selectioncontrols import MDCheckbox
-from kivymd.textfields import MDTextField
 from kivymd.theming import ThemeManager
 import queues
 from semaphores import kivyuisignaler
@@ -1398,7 +1397,7 @@ class NavigationDrawerTwoLineListItem(
     def _update_specific_text_color(self, instance, value):
         pass
 
-    def _set_active(self, active, list):        # pylint: disable=redefined-builtin
+    def _set_active(self, active, list_):
         pass
 
 
diff --git a/src/messagetypes/vote.py b/src/messagetypes/vote.py
index 82a5031f..319deb59 100644
--- a/src/messagetypes/vote.py
+++ b/src/messagetypes/vote.py
@@ -7,8 +7,6 @@ from messagetypes import MsgBase
 # pylint: disable=attribute-defined-outside-init
 
 
-
-
 class Vote(MsgBase):
     """Module used to vote"""
 
diff --git a/src/pyelliptic/openssl.py b/src/pyelliptic/openssl.py
index 0b9be0ab..6c5c4a84 100644
--- a/src/pyelliptic/openssl.py
+++ b/src/pyelliptic/openssl.py
@@ -22,8 +22,6 @@ src/pyelliptic/openssl.py
 # pylint: disable=protected-access
 
 
-
-
 class CipherName:
     """Class returns cipher name, pointer and blocksize"""