Fix merge

pull/1313/head
Andrew 3 months ago
parent 1176273c3a
commit 64a2b4a61c

@ -26,7 +26,6 @@
android:layout_marginTop="@dimen/large_spacing"
android:gravity="center_vertical"
android:hint="@string/fragment_enter_community_url_edit_text_hint"
android:contentDescription="@string/AccessibilityId_community_input_box"
android:inputType="textUri"
android:maxLines="3"
android:paddingTop="0dp"

@ -1044,7 +1044,6 @@
<string name="search_contacts_hint">Search contacts</string>
<string name="activity_join_public_chat_enter_community_url_tab_title">Community URL</string>
<string name="fragment_enter_community_url_edit_text_hint">Enter Community URL</string>
<string name="AccessibilityId_community_input_box">Community input box</string>
<string name="fragment_enter_community_url_join_button_title">Join</string>
<string name="new_conversation_dialog_back_button_content_description">Navigate Back</string>
<string name="new_conversation_dialog_close_button_content_description">Close Dialog</string>

Loading…
Cancel
Save