From 91a557dc0acbe0b1e1d1b858273f1f2ef9f9dfd6 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Mon, 13 Jan 2020 16:25:22 -0800
Subject: [PATCH] For #7423: remove unnecessary CoordinatorLayout in
 fragment_home.

Co-authored-by: Emma Malysz <emalysz@mozilla.com>
---
 app/src/main/res/layout/fragment_home.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 803b5209b..fb63c1fa1 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -50,11 +50,18 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toTopOf="@id/bottom_bar"/>
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     <View
         android:id="@+id/bottom_bar"
         android:layout_width="0dp"
         android:layout_height="56dp"
+=======
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/bottom_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+>>>>>>> 52d4338e... For #7423: remove unnecessary CoordinatorLayout in fragment_home.
         android:background="?bottomBarBackground"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -125,4 +132,3 @@
             app:layout_constraintBottom_toBottomOf="parent"/>
 
 </androidx.constraintlayout.motion.widget.MotionLayout>
-