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

diff --git a/force-app/main/default/objects/BatchIF_Log__c/listViews/NFM206.listView-meta.xml b/force-app/main/default/objects/BatchIF_Log__c/listViews/NFM206.listView-meta.xml
index 8c345e1..4912e20 100644
--- a/force-app/main/default/objects/BatchIF_Log__c/listViews/NFM206.listView-meta.xml
+++ b/force-app/main/default/objects/BatchIF_Log__c/listViews/NFM206.listView-meta.xml
@@ -6,6 +6,7 @@
     <columns>MessageGroupNumber__c</columns>
     <columns>RowDataFlg__c</columns>
     <columns>Log__c</columns>
+    <columns>CREATED_DATE</columns>
     <columns>Last_Update_Date2__c</columns>
     <columns>retry_cnt__c</columns>
     <filterScope>Everything</filterScope>

--
Gitblit v1.9.1