fix(lib): resolve merge manifest errors

Try to fix #68 and #85
passy · Jan 21, 2018 · 25b5c12 · 25b5c12
2 parents 4667c6a + 29b5dad
commit 25b5c12
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
-    package="net.rdrei.android.dirchooser"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    package="net.rdrei.android.dirchooser">
 
-    <application
-        android:theme="@style/DirectoryChooserTheme">
-        <meta-data
-            android:name="string"
-            android:value="string" />
-    </application>
+    <application/>
 </manifest>
diff --git a/library/src/main/res/values/styles.xml → sample/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml → sample/src/main/res/values/styles.xml