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/CompetitorAsset2__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/CompetitorAsset2__c.field-meta.xml b/force-app/main/default/objects/Lost_cancel_report__c/fields/CompetitorAsset2__c.field-meta.xml
index 46aaaa7..21f8a36 100644
--- a/force-app/main/default/objects/Lost_cancel_report__c/fields/CompetitorAsset2__c.field-meta.xml
+++ b/force-app/main/default/objects/Lost_cancel_report__c/fields/CompetitorAsset2__c.field-meta.xml
@@ -3,7 +3,7 @@
     <fullName>CompetitorAsset2__c</fullName>
     <deleteConstraint>SetNull</deleteConstraint>
     <externalId>false</externalId>
-    <label>绔炰簤瀵规墜璧勪骇2</label>
+    <label>绔炰簤瀵规墜璧勪骇2(涓嶄娇鐢�)</label>
     <referenceTo>Asset</referenceTo>
     <relationshipLabel>璇环澶卞崟/鍙栨秷鎶ュ憡</relationshipLabel>
     <relationshipName>Lost_cancel_report_CompetitorAsset2</relationshipName>

--
Gitblit v1.9.1