aboutsummaryrefslogtreecommitdiff
path: root/core-ui/src/main/res-public
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2019-08-16 00:24:22 -0700
committerAllan Wang <me@allanwang.ca>2019-08-16 00:24:22 -0700
commit71dcceaf1970873596a59a734f1a574120beff6b (patch)
treed8d79984f591ec5fc43ac93a15715eaef9b887d3 /core-ui/src/main/res-public
parentd6f213563be35b183f81e20e95d925dbd65e4694 (diff)
parenta9407288fad0d30e71e2f6862b66533e043f9311 (diff)
downloadkau-71dcceaf1970873596a59a734f1a574120beff6b.tar.gz
kau-71dcceaf1970873596a59a734f1a574120beff6b.tar.bz2
kau-71dcceaf1970873596a59a734f1a574120beff6b.zip
Fix conflicts
Diffstat (limited to 'core-ui/src/main/res-public')
-rw-r--r--core-ui/src/main/res-public/values/public.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/core-ui/src/main/res-public/values/public.xml b/core-ui/src/main/res-public/values/public.xml
index 71657d6..c8c2e56 100644
--- a/core-ui/src/main/res-public/values/public.xml
+++ b/core-ui/src/main/res-public/values/public.xml
@@ -1,8 +1,8 @@
<resources xmlns:tools='http://schemas.android.com/tools' tools:ignore='ResourceName'>
<!-- AUTO-GENERATED FILE. DO NOT MODIFY. public.xml is generated by the generatepublicxml gradle task -->
<public name='kau_recycler_detached_background' type='layout' />
- <public name='kau_recycler_textslider' type='layout' />
<public name='kau_elastic_recycler_activity' type='layout' />
+ <public name='kau_recycler_textslider' type='layout' />
<public name='Kau.Translucent' type='style' />
<public name='Kau.Translucent.NoAnimation' type='style' />
<public name='Kau.Translucent.SlideBottom' type='style' />