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/Repair__c/fields/Detailed_Address__c.field-meta.xml |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Repair__c/fields/Detailed_Address__c.field-meta.xml b/force-app/main/default/objects/Repair__c/fields/Detailed_Address__c.field-meta.xml
index b9917b9..62f6668 100644
--- a/force-app/main/default/objects/Repair__c/fields/Detailed_Address__c.field-meta.xml
+++ b/force-app/main/default/objects/Repair__c/fields/Detailed_Address__c.field-meta.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Detailed_Address__c</fullName>
-    <description>鐩磋繑鏀惰揣璇︾粏淇℃伅</description>
     <externalId>false</externalId>
     <label>璇︾粏鍦板潃</label>
     <length>32768</length>

--
Gitblit v1.9.1