From d7fd8e763a03a0bfcb04f2e34db601255cd2f70c Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Mon, 13 Jan 2020 16:23:41 -0800
Subject: [PATCH] For #7423: remove unnecessary wordmark_spacer view.

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

diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 4d80b7d44..803b5209b 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -50,10 +50,11 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toTopOf="@id/bottom_bar"/>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+<<<<<<< HEAD
+    <View
         android:id="@+id/bottom_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_width="0dp"
+        android:layout_height="56dp"
         android:background="?bottomBarBackground"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -123,6 +124,5 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
 </androidx.constraintlayout.motion.widget.MotionLayout>
+