solve conflict

81134a3f · fallenstardust · d10f600f · 81134a3f
Commit 81134a3f authored Nov 09, 2019 by fallenstardust
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

mobile/src/main/res/values/colors.xml mobile/src/main/res/values/colors.xml +0 -1

No files found.
--- a/mobile/src/main/res/values/colors.xml
+++ b/mobile/src/main/res/values/colors.xml
@@ -26,5 +26,4 @@
    <color name="FallNavy">#11113d</color>
    <color name="colorMain">#2196F3</color>
    <color name="background">#ECEFF1</color>
-    <color name="FallNavy">#11113d</color>
 </resources>
\ No newline at end of file