jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3963 from vector-im/feature/bma/fix_develop 

Remove the useless merge tag
This commit is contained in:
Benoit Marty 2021-09-03 17:01:38 +02:00 committed by GitHub
parent 377c4e00a3 dbd11c2e8d
commit f862ce5326
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 50 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vector/src/main/res/layout/merge_overlay_waiting_view.xml
View File

@ -1,11 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/waiting_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -67,6 +63,4 @@
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</merge>
</androidx.constraintlayout.widget.ConstraintLayout>