aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurelien Hubert <aurel.hubert@gmail.com>2016-03-19 11:05:28 +0100
committerAurelien Hubert <aurel.hubert@gmail.com>2016-03-19 11:05:28 +0100
commite8d178af5394679c29cec607a47f3cc9cf4e7b1d (patch)
tree655619268dbcb0b4e27a8fe80a720dcda677207d
parent65cd74e2a322a058de7726ead0f7c95e47107d85 (diff)
parentb719851676f55feb7d80777919894dd6c1bf90b9 (diff)
downloadandroid_external_ahbottomnavigation-e8d178af5394679c29cec607a47f3cc9cf4e7b1d.tar.gz
android_external_ahbottomnavigation-e8d178af5394679c29cec607a47f3cc9cf4e7b1d.tar.bz2
android_external_ahbottomnavigation-e8d178af5394679c29cec607a47f3cc9cf4e7b1d.zip
Merge pull request #6 from guavabot/fix-manifest-merge
Remove application subelements that can block Manifest merge
-rw-r--r--ahbottomnavigation/src/main/AndroidManifest.xml7
-rw-r--r--ahbottomnavigation/src/main/res/values/strings.xml3
2 files changed, 1 insertions, 9 deletions
diff --git a/ahbottomnavigation/src/main/AndroidManifest.xml b/ahbottomnavigation/src/main/AndroidManifest.xml
index 2957692..66d6443 100644
--- a/ahbottomnavigation/src/main/AndroidManifest.xml
+++ b/ahbottomnavigation/src/main/AndroidManifest.xml
@@ -2,11 +2,6 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<application
- android:allowBackup="true"
- android:label="@string/app_name"
- android:supportsRtl="true"
- >
-
- </application>
+ />
</manifest>
diff --git a/ahbottomnavigation/src/main/res/values/strings.xml b/ahbottomnavigation/src/main/res/values/strings.xml
deleted file mode 100644
index 9b58275..0000000
--- a/ahbottomnavigation/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
- <string name="app_name">AHBottomNavigation</string>
-</resources>