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_Contract__c/webLinks/CustomNewCopy2.webLink-meta.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/Maintenance_Contract__c/webLinks/CustomNewCopy2.webLink-meta.xml b/force-app/main/default/objects/Maintenance_Contract__c/webLinks/CustomNewCopy2.webLink-meta.xml
index 852f8f4..7a25929 100644
--- a/force-app/main/default/objects/Maintenance_Contract__c/webLinks/CustomNewCopy2.webLink-meta.xml
+++ b/force-app/main/default/objects/Maintenance_Contract__c/webLinks/CustomNewCopy2.webLink-meta.xml
@@ -9,7 +9,7 @@
     <protected>false</protected>
     <url>{!RequireScript(&quot;/soap/ajax/51.0/connection.js&quot;)}
 {!RequireScript(&quot;/soap/ajax/51.0/apex.js&quot;)}
-//2021-10-22 gwy 鐗堟湰鏇存敼涓�51.0
+
 
 if( {!Maintenance_Contract__c.notRenew__c} ){
 alert(&quot;璇疯仈绯绘湇鍔″晢鍝侀儴锛�&quot;);

--
Gitblit v1.9.1