From 5b3256803b8e8e3900adf4a04ffbf338cb5a2aa7 Mon Sep 17 00:00:00 2001
From: Mustafa Kaya <mustafa@brickly.io>
Date: Mon, 9 Jan 2017 12:04:52 +0300
Subject: [PATCH] manifest merge problem fixed

---
 stateprogressbar/src/main/AndroidManifest.xml    | 7 +------
 stateprogressbar/src/main/res/values/strings.xml | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/stateprogressbar/src/main/AndroidManifest.xml b/stateprogressbar/src/main/AndroidManifest.xml
index 40e9cb3..db2a4f0 100644
--- a/stateprogressbar/src/main/AndroidManifest.xml
+++ b/stateprogressbar/src/main/AndroidManifest.xml
@@ -1,8 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.kofigyan.stateprogressbar">
-
-    <application android:allowBackup="true" android:label="@string/app_name">
-
-    </application>
+<manifest package="com.kofigyan.stateprogressbar">
 
 </manifest>
diff --git a/stateprogressbar/src/main/res/values/strings.xml b/stateprogressbar/src/main/res/values/strings.xml
index 2281de1..6418e0a 100644
--- a/stateprogressbar/src/main/res/values/strings.xml
+++ b/stateprogressbar/src/main/res/values/strings.xml
@@ -1,4 +1,3 @@
 <resources>
-    <string name="app_name">stateprogressbar</string>
     <string name="check_icon">&#xf00c;</string>
 </resources>