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/Lost_cancel_report__c/fields/Proposal_Competitors__c.field-meta.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/objects/Lost_cancel_report__c/fields/Proposal_Competitors__c.field-meta.xml b/force-app/main/default/objects/Lost_cancel_report__c/fields/Proposal_Competitors__c.field-meta.xml
index 94c6648..c1aabc9 100644
--- a/force-app/main/default/objects/Lost_cancel_report__c/fields/Proposal_Competitors__c.field-meta.xml
+++ b/force-app/main/default/objects/Lost_cancel_report__c/fields/Proposal_Competitors__c.field-meta.xml
@@ -2,7 +2,7 @@
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>Proposal_Competitors__c</fullName>
<externalId>false</externalId>
- <label>绔炰簤瀵规墜鏂规鍐呭</label>
+ <label>绔炰簤瀵规墜鏂规鍐呭(涓嶄娇鐢�)</label>
<required>false</required>
<trackTrending>false</trackTrending>
<type>Picklist</type>
--
Gitblit v1.9.1