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

diff --git a/force-app/main/default/objects/SMARM__c/webLinks/SubmitAndProcess.webLink-meta.xml b/force-app/main/default/objects/SMARM__c/webLinks/SubmitAndProcess.webLink-meta.xml
index f20b727..09d2daf 100644
--- a/force-app/main/default/objects/SMARM__c/webLinks/SubmitAndProcess.webLink-meta.xml
+++ b/force-app/main/default/objects/SMARM__c/webLinks/SubmitAndProcess.webLink-meta.xml
@@ -10,7 +10,7 @@
     <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 smarm = new sforce.SObject(&quot;SMARM__c&quot;);
     smarm.Id = &quot;{!SMARM__c.Id}&quot;;

--
Gitblit v1.9.1