From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict

---
 force-app/main/default/objects/Rental_Apply__c/listViews/All_Waiting_approved01.listView-meta.xml |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Rental_Apply__c/listViews/All_Waiting_approved01.listView-meta.xml b/force-app/main/default/objects/Rental_Apply__c/listViews/All_Waiting_approved01.listView-meta.xml
index 8437c2c..65486c3 100644
--- a/force-app/main/default/objects/Rental_Apply__c/listViews/All_Waiting_approved01.listView-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/listViews/All_Waiting_approved01.listView-meta.xml
@@ -15,7 +15,6 @@
     <columns>Return_dadeline_final__c</columns>
     <columns>applyUser__c</columns>
     <columns>CREATED_DATE</columns>
-    <columns>RECORDTYPE</columns>
     <filterScope>Everything</filterScope>
     <label>01_鍏ㄩ儴澶囧搧鐢宠</label>
     <language>zh_CN</language>

--
Gitblit v1.9.1