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/Agency_Opportunity__c/listViews/View_tar.listView-meta.xml |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_tar.listView-meta.xml b/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_tar.listView-meta.xml
index ad0483d..3811ef0 100644
--- a/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_tar.listView-meta.xml
+++ b/force-app/main/default/objects/Agency_Opportunity__c/listViews/View_tar.listView-meta.xml
@@ -7,7 +7,6 @@
     <columns>ocsm_Category__c</columns>
     <columns>OCM_Term__c</columns>
     <columns>Product_Category__c</columns>
-    <columns>CREATED_DATE</columns>
     <filterScope>Everything</filterScope>
     <filters>
         <field>NAME</field>

--
Gitblit v1.9.1