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/Account_Number_of_case__c/fields/case_Sterilizer__c.field-meta.xml | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/objects/Account_Number_of_case__c/fields/case_Sterilizer__c.field-meta.xml b/force-app/main/default/objects/Account_Number_of_case__c/fields/case_Sterilizer__c.field-meta.xml
index 08d2c8c..3c5e8cc 100644
--- a/force-app/main/default/objects/Account_Number_of_case__c/fields/case_Sterilizer__c.field-meta.xml
+++ b/force-app/main/default/objects/Account_Number_of_case__c/fields/case_Sterilizer__c.field-meta.xml
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
<fullName>case_Sterilizer__c</fullName>
- <description>鏂扮梾渚嬫暟鏀堕泦锛氬叏鑷姩娓呮礂娑堟瘨鏈烘暟閲忥紙鍙帮級(妫�鏌ユ暟)</description>
<externalId>false</externalId>
- <label>鏂扮梾渚嬫暟鏀堕泦锛氬叏鑷姩娓呮礂娑堟瘨鏈烘暟閲忥紙鍙帮級(妫�鏌ユ暟)</label>
+ <label>娲楁秷鏈烘暟閲忥紙鍙帮級</label>
<precision>18</precision>
<required>false</required>
<scale>0</scale>
--
Gitblit v1.9.1