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

resolve conflict

Browse source
This commit is contained in:
Christian Schabesberger 2017-11-16 12:20:03 +01:00
commit fba3ece688
16 changed files with 134 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,6 +21,7 @@
<attr name="drag_handle" format="reference"/>
<attr name="selected" format="reference"/>
<attr name="search_add" format="reference"/>
<attr name="options" format="reference"/>
<!-- Can't refer to colors directly into drawable's xml-->
<attr name="toolbar_shadow_drawable" format="reference"/>