Remove merge conflict marker from styles.xml

beemdevelopment · Aug 1, 2020 · 874f5e9 · 874f5e9
1 parent 7518408
commit 874f5e9
Showing 1 changed file with 0 additions and 2 deletions.
diff --git 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">