From cd8cfaefdd2f46ccf3f38b5f292ff4853c5ca6ae Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 2 Jan 2024 18:07:11 +0100
Subject: [PATCH] fix header

---
 Habitica/res/layout/shop_header.xml | 4 ++--
 version.properties                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Habitica/res/layout/shop_header.xml b/Habitica/res/layout/shop_header.xml
index e827213ea..8a9d83967 100644
--- a/Habitica/res/layout/shop_header.xml
+++ b/Habitica/res/layout/shop_header.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
@@ -48,4 +48,4 @@
         android:layout_marginBottom="4dp"
         style="@style/Body1"
         tools:text="Welcome to the Market! Stock up on new gear or buy rare eggs and potions. Check in periodically for new stock." />
-</merge>
+</FrameLayout>
diff --git a/version.properties b/version.properties
index d3b831d16..6abfdaa21 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.3.2
-CODE=6781
\ No newline at end of file
+CODE=6801
\ No newline at end of file