From 0686db8061b2c5c116395dd935e8cfdbaeda16b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com>
Date: Thu, 26 Jun 2025 00:52:49 +0800
Subject: [PATCH] =?UTF-8?q?fariygui=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wb_new_ui/assets/Family/package.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/wb_new_ui/assets/Family/package.xml b/wb_new_ui/assets/Family/package.xml
index 2020eebc..e9a61b6d 100644
--- a/wb_new_ui/assets/Family/package.xml
+++ b/wb_new_ui/assets/Family/package.xml
@@ -320,11 +320,7 @@
     <image id="yk1o7d41" name="Group 556.png" path="/MyFamily/Image/"/>
     <component id="yk1o7d42" name="btn_myFamilylist.xml" path="/MyFamily/Component/"/>
     <component id="yk1o7d43" name="com_numberRemark.xml" path="/NumberRemark/" exported="true"/>
-<<<<<<< HEAD
-    <component id="95rc7d4d" name="com_familyRoomCardRecord.xml" path="/FamilyRoomCardRecord/"/>
-=======
     <component id="95rc7d4d" name="com_familyRoomCardRecord.xml" path="/FamilyRoomCardRecord/" exported="true"/>
->>>>>>> 9cc8415a0cfae87c6dc49e927ee054dfac98e95a
     <image id="95rc7d4e" name="Group 557.png" path="/Main/Image/" scale="9grid" scale9grid="59,36,39,0"/>
     <image id="95rc7d4f" name="Group 365.png" path="/Main/Image/" scale="9grid" scale9grid="33,32,96,95"/>
     <component id="95rc7d4g" name="item_record.xml" path="/FamilyRoomCardRecord/Component/"/>