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/Maintenance_Task__c/webLinks/CreateReport.webLink-meta.xml |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Maintenance_Task__c/webLinks/CreateReport.webLink-meta.xml b/force-app/main/default/objects/Maintenance_Task__c/webLinks/CreateReport.webLink-meta.xml
index 1925100..343ea05 100644
--- a/force-app/main/default/objects/Maintenance_Task__c/webLinks/CreateReport.webLink-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Task__c/webLinks/CreateReport.webLink-meta.xml
@@ -11,7 +11,6 @@
     <url>{!REQUIRESCRIPT(&quot;/soap/ajax/51.0/connection.js&quot;)};
 {!REQUIRESCRIPT(&quot;/soap/ajax/51.0/apex.js&quot;)};
 {!RequireScript(&quot;/resource/CommonUtilJs&quot;)}
-//2021-10-22 gwy 鐗堟湰鏇存敼涓�51.0
 var foo = function() {
 var MaintenanceContractId = &quot;{!Maintenance_Contract__c.Id}&quot;;
 var RecordTypeName = &quot;{!Maintenance_Contract__c.RecordType_DeveloperName__c}&quot;;

--
Gitblit v1.9.1