From f95c07cc3c0827b4c42c1a3e5c5947270e337985 Mon Sep 17 00:00:00 2001 From: kunfei Date: Mon, 27 Jan 2020 20:39:11 +0800 Subject: [PATCH] Merge branch 'eink' of https://github.com/FadeApp/legado into FadeApp-eink # Conflicts: # app/src/main/java/io/legado/app/lib/theme/ATH.kt # app/src/main/java/io/legado/app/utils/ContextExtensions.kt --- app/src/main/res/xml/pref_config_theme.xml | 7 ------- app/src/main/res/xml/pref_main.xml | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/xml/pref_config_theme.xml b/app/src/main/res/xml/pref_config_theme.xml index 853b2fb12..4988e08bf 100644 --- a/app/src/main/res/xml/pref_config_theme.xml +++ b/app/src/main/res/xml/pref_config_theme.xml @@ -2,13 +2,6 @@ - - + +