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_Report__c/fields/WorkMark__c.field-meta.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/objects/Agency_Report__c/fields/WorkMark__c.field-meta.xml b/force-app/main/default/objects/Agency_Report__c/fields/WorkMark__c.field-meta.xml
index ab25169..cef3c32 100644
--- a/force-app/main/default/objects/Agency_Report__c/fields/WorkMark__c.field-meta.xml
+++ b/force-app/main/default/objects/Agency_Report__c/fields/WorkMark__c.field-meta.xml
@@ -3,7 +3,7 @@
<fullName>WorkMark__c</fullName>
<defaultValue>false</defaultValue>
<externalId>false</externalId>
- <label>宸ヤ綔鏍囪</label>
+ <label>鏀彺闇�姹�</label>
<trackHistory>false</trackHistory>
<trackTrending>false</trackTrending>
<type>Checkbox</type>
--
Gitblit v1.9.1