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/Report__c/fields/Key_product1__c.field-meta.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Report__c/fields/Key_product1__c.field-meta.xml b/force-app/main/default/objects/Report__c/fields/Key_product1__c.field-meta.xml
index a73aa75..a3c72e9 100644
--- a/force-app/main/default/objects/Report__c/fields/Key_product1__c.field-meta.xml
+++ b/force-app/main/default/objects/Report__c/fields/Key_product1__c.field-meta.xml
@@ -15,7 +15,7 @@
 &quot;&quot;
 )</formula>
     <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
-    <label>閲嶇偣浜у搧鍖哄垎1</label>
+    <label>鎴樼暐浜у搧鍖哄垎1</label>
     <required>false</required>
     <trackHistory>false</trackHistory>
     <trackTrending>false</trackTrending>

--
Gitblit v1.9.1