resolve conflict
This commit is contained in:
commit
7bc139bcc9
1 changed files with 2 additions and 0 deletions
|
@ -26,6 +26,8 @@
|
|||
android:text="01.01.2017"
|
||||
android:textAppearance="@style/TextAppearance.Conversations.Body1"
|
||||
android:textStyle="italic" />
|
||||
android:textAppearance="@style/TextAppearance.Conversations.Body1.Secondary"
|
||||
android:textStyle="bold" />
|
||||
</LinearLayout>
|
||||
|
||||
</RelativeLayout>
|
Loading…
Add table
Reference in a new issue