Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 11 Projects Releases Packages Wiki Activity Actions

fix merge conflict

Browse source
This commit is contained in:
Christian Schabesberger 2019-01-23 16:12:21 +01:00
commit 9269dcc984
38 changed files with 353 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/res/values/attrs.xml
View file

@ -41,6 +41,7 @@
<attr name="ic_list" format="reference"/>
<attr name="ic_grid" format="reference"/>
<attr name="ic_delete" format="reference"/>
<attr name="ic_settings_update" format="reference"/>
<!-- Can't refer to colors directly in drawable's xml-->
<attr name="toolbar_shadow_drawable" format="reference"/>