luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-05-31 11:52:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Remove merge conflict marker from styles.xml

Browse source
This commit is contained in:
Alexander Bakker 2020-08-01 19:49:50 +02:00
parent 7518408554
commit 874f5e9058
1 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/values/styles.xml
View file

@ -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">