From 874f5e905801a09961ba2b9c58b365143aceb99e Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Sat, 1 Aug 2020 19:49:50 +0200
Subject: [PATCH] Remove merge conflict marker from styles.xml

---
 app/src/main/res/values/styles.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7a58d00938..22c4f30c3f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -57,7 +57,6 @@
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
         <item name="android:windowContentOverlay">@null</item>
->>>>>>> Replace AppIntro with a new custom intro
         <item name="primaryText">@color/primary_text_dark</item>
         <item name="background">@color/background_dark</item>
         <item name="authText">@color/primary_text_inverted</item>
@@ -77,7 +76,6 @@
 
         <item name="android:navigationBarColor" tools:targetApi="lollipop">@color/background_true_dark</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
-
     </style>
 
     <style name="ActionModeStyle" parent="@style/Widget.AppCompat.Light.ActionMode.Inverse">