Merge pull request #2 from pushbit/patch-1

removing icon to avoid manifest merger conflicts
wujingchao · May 13, 2015 · d6c92c3 · d6c92c3
2 parents 8b6dcc0 + 4101bb0
commit d6c92c3
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/simple-tag-imageview/src/main/AndroidManifest.xml b/simple-tag-imageview/src/main/AndroidManifest.xml
@@ -1,8 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="wujingchao.net.mylibrary">
 
-    <application android:allowBackup="true" android:label="@string/app_name"
-        android:icon="@drawable/ic_launcher">
+    <application android:allowBackup="true" android:label="@string/app_name">
 
     </application>