Fix rebase errors

This commit is contained in:
moezbhatti
2019-08-21 23:10:27 +02:00
parent cb0af93594
commit d8fbb324a2
6 changed files with 10 additions and 7 deletions
@@ -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