mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-18 20:08:53 +01:00
Fix rebase errors
This commit is contained in:
@@ -67,9 +67,9 @@
|
||||
android:paddingTop="16dp"
|
||||
android:paddingEnd="16dp"
|
||||
android:text="@string/blocking_conversations"
|
||||
android:textColor="?android:attr/textColorSecondary"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintTop_toBottomOf="@id/conversationsDivider"
|
||||
app:textColor="secondary"
|
||||
app:textSize="secondary" />
|
||||
|
||||
<com.moez.QKSMS.common.widget.QkTextView
|
||||
|
||||
Reference in New Issue
Block a user