手动解决合并冲突

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" />
 
 

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" />