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/Event__c/fields/Activity_Purpose__c.field-meta.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/objects/Event__c/fields/Activity_Purpose__c.field-meta.xml b/force-app/main/default/objects/Event__c/fields/Activity_Purpose__c.field-meta.xml
index 87c4d37..1008251 100644
--- a/force-app/main/default/objects/Event__c/fields/Activity_Purpose__c.field-meta.xml
+++ b/force-app/main/default/objects/Event__c/fields/Activity_Purpose__c.field-meta.xml
@@ -149,7 +149,7 @@
<value>
<fullName>棰勯槻淇濆叏娲诲姩</fullName>
<default>false</default>
- <label>棰勯槻淇濆叏娲诲姩</label>
+ <label>鏁呴殰棰勯槻娲诲姩</label>
</value>
<value>
<fullName>甯傚満澶氬勾淇濅慨</fullName>
--
Gitblit v1.9.1