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/NFM103.listView-meta.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/objects/BatchIF_Log__c/listViews/NFM103.listView-meta.xml b/force-app/main/default/objects/BatchIF_Log__c/listViews/NFM103.listView-meta.xml
index 3854bfa..e4044eb 100644
--- a/force-app/main/default/objects/BatchIF_Log__c/listViews/NFM103.listView-meta.xml
+++ b/force-app/main/default/objects/BatchIF_Log__c/listViews/NFM103.listView-meta.xml
@@ -4,9 +4,12 @@
<columns>NAME</columns>
<columns>MessageGroupNumber__c</columns>
<columns>Type__c</columns>
- <columns>Log__c</columns>
+ <columns>Is_Error__c</columns>
<columns>ErrorLog__c</columns>
+ <columns>Log__c</columns>
<columns>Last_Update_Date2__c</columns>
+ <columns>UPDATEDBY_USER</columns>
+ <columns>CREATED_DATE</columns>
<filterScope>Everything</filterScope>
<filters>
<field>Type__c</field>
--
Gitblit v1.9.1