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
@@ -30,7 +30,7 @@
android:layout_marginTop="16dp"
android:layout_marginEnd="24dp"
android:text="@string/blocked_numbers_dialog_title"
app:textColor="primary"
android:textColor="?android:attr/textColorPrimary"
app:textSize="dialog" />
<com.moez.QKSMS.common.widget.QkEditText
@@ -39,8 +39,8 @@
android:layout_height="wrap_content"
android:background="@null"
android:hint="@string/blocked_numbers_dialog_hint"
android:paddingStart="24dp"
android:inputType="phone"
android:paddingStart="24dp"
android:paddingTop="16dp"
android:paddingEnd="24dp"
android:paddingBottom="16dp"