From 976e070ae32be41240849a11285c19f8a050f2db Mon Sep 17 00:00:00 2001
From: duqingquan <duqingquan@dcloud.io>
Date: Thu, 22 Aug 2024 18:04:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E8=A7=A3=E5=86=B3=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layout/uni_prompt_ac_recyclerview_layout_top.xml  | 11 -----------
 .../uni_prompt_ac_recyclerview_layout_top_night.xml   |  9 ---------
 2 files changed, 20 deletions(-)

diff --git a/uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top.xml b/uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top.xml
index 92dfa56..47e9e85 100644
--- a/uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top.xml
+++ b/uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top.xml
@@ -9,28 +9,17 @@
         android:id="@+id/line_bottom"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-<<<<<<<< HEAD:uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top_night.xml
-        android:background="@color/uni_prompt_night_bg_hair_line_night"
-========
         android:background="@color/uni_prompt_night_bg_hair_line"
->>>>>>>> alpha:uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top.xml
         android:orientation="vertical" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tvName"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-<<<<<<<< HEAD:uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top_night.xml
-        android:background="@drawable/uni_prompt_actionsheet_button_select_total_night_top"
-        android:gravity="center"
-        android:padding="17dp"
-        android:textColor="@color/uni_prompt_dialog_title_text_night"
-========
         android:gravity="center"
         android:padding="17dp"
         android:textColor="@color/uni_prompt_dialog_title_text"
         android:background="@drawable/uni_prompt_actionsheet_button_select_total_top"
->>>>>>>> alpha:uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top.xml
         android:textSize="16dp" />
 
 
diff --git a/uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top_night.xml b/uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top_night.xml
index c66f06b..ddcb225 100644
--- a/uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top_night.xml
+++ b/uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top_night.xml
@@ -9,11 +9,7 @@
         android:id="@+id/line_bottom"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-<<<<<<<< HEAD:uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top.xml
-        android:background="@color/uni_prompt_night_bg_hair_line"
-========
         android:background="@color/uni_prompt_night_bg_hair_line_night"
->>>>>>>> alpha:uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top_night.xml
         android:orientation="vertical" />
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -23,12 +19,7 @@
         android:background="@drawable/uni_prompt_actionsheet_button_select_total_night_top"
         android:gravity="center"
         android:padding="17dp"
-<<<<<<<< HEAD:uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top.xml
-        android:textColor="@color/uni_prompt_dialog_title_text"
-        android:background="@drawable/uni_prompt_actionsheet_button_select_total_top"
-========
         android:textColor="@color/uni_prompt_dialog_title_text_night"
->>>>>>>> alpha:uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top_night.xml
         android:textSize="16dp" />
 
 
-- 
GitLab