resolve conflict

This commit is contained in:
Aman9das 2021-09-28 20:51:49 +05:30
commit c5fe19ddb1

View file

@ -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>