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

diff --git a/force-app/main/default/objects/meeting_delay_apply__c/fields/MeetingApproved__c.field-meta.xml b/force-app/main/default/objects/meeting_delay_apply__c/fields/MeetingApproved__c.field-meta.xml
index 81be8b8..19ec7d4 100644
--- a/force-app/main/default/objects/meeting_delay_apply__c/fields/MeetingApproved__c.field-meta.xml
+++ b/force-app/main/default/objects/meeting_delay_apply__c/fields/MeetingApproved__c.field-meta.xml
@@ -5,8 +5,8 @@
     <externalId>false</externalId>
     <label>浼氳鍐宠鐢宠</label>
     <referenceTo>Application_for_Conference_Adjudication__c</referenceTo>
-    <relationshipLabel>浼氳鍙樻洿鐢宠 (浼氳鍐宠鐢宠)</relationshipLabel>
-    <relationshipName>MeetingApproved_change</relationshipName>
+    <relationshipLabel>浼氳鍙樻洿鐢宠</relationshipLabel>
+    <relationshipName>MeetingApprovedHnUG</relationshipName>
     <required>false</required>
     <trackTrending>false</trackTrending>
     <type>Lookup</type>

--
Gitblit v1.9.1