TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-11 10:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Niels Andriesse
2021-05-14 13:53:41 +10:00
parent 9699126ac9
commit 6e5f75d472
3 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/res/layout-sw400dp/fragment_enter_chat_url.xml
View File

@@ -33,12 +33,7 @@
<LinearLayout
android:visibility="gone"
<<<<<<< HEAD
android:paddingHorizontal="24dp"
android:id="@+id/defaultRoomsParent"
=======
android:id="@+id/defaultRoomsContainer"
>>>>>>> 133bcac17 (Make chips look better)
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

5
app/src/main/res/layout/fragment_enter_chat_url.xml
View File

@@ -33,12 +33,7 @@
<LinearLayout
android:visibility="gone"
<<<<<<< HEAD
android:paddingHorizontal="24dp"
android:id="@+id/defaultRoomsParent"
=======
android:id="@+id/defaultRoomsContainer"
>>>>>>> 133bcac17 (Make chips look better)
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">