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/task__c/listViews/All.listView-meta.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/objects/task__c/listViews/All.listView-meta.xml b/force-app/main/default/objects/task__c/listViews/All.listView-meta.xml
index d7ddba2..f320984 100644
--- a/force-app/main/default/objects/task__c/listViews/All.listView-meta.xml
+++ b/force-app/main/default/objects/task__c/listViews/All.listView-meta.xml
@@ -11,6 +11,6 @@
<columns>UPDATEDBY_USER</columns>
<columns>LAST_UPDATE</columns>
<filterScope>Everything</filterScope>
- <label>鍏ㄩ儴</label>
+ <label>1 鍏ㄩ儴</label>
<language>zh_CN</language>
</ListView>
--
Gitblit v1.9.1