fixes after conflicts
This commit is contained in:
parent
52c849703f
commit
66de416627
|
@ -49,7 +49,6 @@ from kivymd.navigationdrawer import (
|
||||||
MDNavigationDrawer,
|
MDNavigationDrawer,
|
||||||
NavigationDrawerHeaderBase)
|
NavigationDrawerHeaderBase)
|
||||||
from kivymd.selectioncontrols import MDCheckbox
|
from kivymd.selectioncontrols import MDCheckbox
|
||||||
from kivymd.textfields import MDTextField
|
|
||||||
from kivymd.theming import ThemeManager
|
from kivymd.theming import ThemeManager
|
||||||
import queues
|
import queues
|
||||||
from semaphores import kivyuisignaler
|
from semaphores import kivyuisignaler
|
||||||
|
@ -1398,7 +1397,7 @@ class NavigationDrawerTwoLineListItem(
|
||||||
def _update_specific_text_color(self, instance, value):
|
def _update_specific_text_color(self, instance, value):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def _set_active(self, active, list): # pylint: disable=redefined-builtin
|
def _set_active(self, active, list_):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -7,8 +7,6 @@ from messagetypes import MsgBase
|
||||||
# pylint: disable=attribute-defined-outside-init
|
# pylint: disable=attribute-defined-outside-init
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class Vote(MsgBase):
|
class Vote(MsgBase):
|
||||||
"""Module used to vote"""
|
"""Module used to vote"""
|
||||||
|
|
||||||
|
|
|
@ -22,8 +22,6 @@ src/pyelliptic/openssl.py
|
||||||
# pylint: disable=protected-access
|
# pylint: disable=protected-access
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class CipherName:
|
class CipherName:
|
||||||
"""Class returns cipher name, pointer and blocksize"""
|
"""Class returns cipher name, pointer and blocksize"""
|
||||||
|
|
||||||
|
|
Reference in New Issue
Block a user