From 15842e7ad8838c1df3201243b784bd0d60330c39 Mon Sep 17 00:00:00 2001
From: Najm Sheikh <najmsheikh@users.noreply.github.com>
Date: Fri, 23 Feb 2018 01:38:31 -0500
Subject: [PATCH] Removing merge conflict

I was trying to use this library in my project but got a manifest conflict.

Solution as per, https://medium.com/@elye.project/2-lines-in-manifest-to-remove-when-sharing-your-android-library-565d4c4af04a
---
 library/src/main/AndroidManifest.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index 633e89cb..4cb9faf8 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -2,8 +2,7 @@
 
     package="com.pchmn.materialchips">
 
-    <application android:allowBackup="true" android:label="@string/app_name"
-        android:supportsRtl="true">
+    <application android:label="@string/app_name">
 
     </application>