Skip to content

Y
YGOMobile-Cn-Ko-En
Commit 81134a3f authored by fallenstardust's avatar fallenstardust
Browse files
Options

solve conflict

parent d10f600f
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
mobile/src/main/res/values/colors.xml
View file @ 81134a3f
...@@ -26,5 +26,4 @@ ...@@ -26,5 +26,4 @@
<color name="FallNavy">#11113d</color> <color name="FallNavy">#11113d</color>
<color name="colorMain">#2196F3</color> <color name="colorMain">#2196F3</color>
<color name="background">#ECEFF1</color> <color name="background">#ECEFF1</color>
<color name="FallNavy">#11113d</color>
</resources> </resources>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment