diff options
author | cretin45 <cretin45@gmail.com> | 2016-01-18 14:49:19 -0800 |
---|---|---|
committer | cretin45 <cretin45@gmail.com> | 2016-01-18 14:49:19 -0800 |
commit | 7d9ebd36aceddd6d1099d50e34de69f1413d5d0a (patch) | |
tree | 75709cbd8a1152158204fe0050cc2df2c4a9e447 | |
parent | 3e92fbe5df8756f36a65dfd48c6bd9c24534a3a6 (diff) | |
download | android_external_cyanogen_UICommon-7d9ebd36aceddd6d1099d50e34de69f1413d5d0a.tar.gz android_external_cyanogen_UICommon-7d9ebd36aceddd6d1099d50e34de69f1413d5d0a.tar.bz2 android_external_cyanogen_UICommon-7d9ebd36aceddd6d1099d50e34de69f1413d5d0a.zip |
Fix merge derp
Change-Id: I43ecbe16244d7c0c0e1d56431f9e4c677f23b7ae
-rw-r--r-- | res/values/colors.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index cb321b9..40e3503 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -3,5 +3,4 @@ <color name="expanding_card_selected_color">#ffffff</color> <color name="expanding_card_start_gradient">#fafafa</color> <color name="snackbar_background_color">#323232</color> - <color name="snackbar_background_color">#323232</color> </resources>
\ No newline at end of file |