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

diff --git a/force-app/main/default/objects/SolutionProjectRequirements__c/webLinks/Closing_Case.webLink-meta.xml b/force-app/main/default/objects/SolutionProjectRequirements__c/webLinks/Closing_Case.webLink-meta.xml
index 2b6f9eb..9ba3da9 100644
--- a/force-app/main/default/objects/SolutionProjectRequirements__c/webLinks/Closing_Case.webLink-meta.xml
+++ b/force-app/main/default/objects/SolutionProjectRequirements__c/webLinks/Closing_Case.webLink-meta.xml
@@ -23,7 +23,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-21 gwy 鐗堟湰鏇存敼涓�51.0
 if(&apos;{!$Profile.Id}&apos;!=&apos;00e10000000xnon&apos;){
 alert(&quot;鍙湁GIR绐楀彛鍙互缁撴&quot;);
 }else if(&quot;{!SolutionProjectRequirements__c.Status__c}&quot;==&apos;07缁撴&apos;){

--
Gitblit v1.9.1