Merge pull request #41 from RaphaelMarion/master

fix androidManifest merge
myinnos · Jun 4, 2018 · 3f3a180 · 3f3a180
2 parents 37cd024 + ea4d658
commit 3f3a180
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 4 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/alphabetsindexfastscrollrecycler/src/main/AndroidManifest.xml b/alphabetsindexfastscrollrecycler/src/main/AndroidManifest.xml
@@ -1,8 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="in.myinnos.alphabetsindexfastscrollrecycler">
 
-    <application android:allowBackup="true" android:label="@string/app_name"
-        android:supportsRtl="true">
+    <application >
 
     </application>
 

diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1,2 @@
-include ':app', ':alphabetsindexfastscrollrecyclerLibrary'
-project(':alphabetsindexfastscrollrecyclerLibrary').projectDir = new File('alphabetsindexfastscrollrecycler')
+include ':alphabetsindexfastscrollrecyclerLibrary'
+project(':alphabetsindexfastscrollrecyclerLibrary').projectDir = new File('alphabetsindexfastscrollrecycler')