From 36932d67bda6b4464bce8033457a134b16733ba3 Mon Sep 17 00:00:00 2001 From: Selim Date: Mon, 27 Jul 2015 14:17:08 +0300 Subject: [PATCH 1/2] Remove app_name string App_name string be a problem on merging manifests. Give error duplicate resources. Libraries don't need app_name string. --- library/src/main/res/values/strings.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml index 4aa80a0..045e125 100644 --- a/library/src/main/res/values/strings.xml +++ b/library/src/main/res/values/strings.xml @@ -1,4 +1,3 @@ - InfiniteIndicator - \ No newline at end of file + From bbcfdab21358cac747652f921ad679fb1f9b9451 Mon Sep 17 00:00:00 2001 From: Selim Date: Mon, 27 Jul 2015 14:17:42 +0300 Subject: [PATCH 2/2] Remove app_name string --- library/src/main/AndroidManifest.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index f7e9090..30ad215 100644 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -3,8 +3,7 @@ - +