From df5aa8087c2c7328dc4188f05d762c8df1f0b07a Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 18 七月 2023 09:19:12 +0800
Subject: [PATCH] changeorg

---
 force-app/main/default/triggers/ContentDocumentLink.trigger |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/force-app/main/default/triggers/ContentDocumentLink.trigger b/force-app/main/default/triggers/ContentDocumentLink.trigger
index d01d1f6..4590320 100644
--- a/force-app/main/default/triggers/ContentDocumentLink.trigger
+++ b/force-app/main/default/triggers/ContentDocumentLink.trigger
@@ -1,14 +1,8 @@
-<<<<<<< HEAD
 trigger ContentDocumentLink on ContentDocumentLink(before delete, after insert) {
-    if ((!Test.isRunningTest()) && UserInfo.getUserId() == System.Label.ByPassTrigger) {
-=======
-trigger ContentDocumentLink on ContentDocumentLink (before delete, after insert) {
-
     System.debug('UserInfo.getUserId() = ' + UserInfo.getUserId());
     System.debug('System.Label.ByPassTrigger = ' + System.Label.ByPassTrigger);
-    if((!Test.isRunningTest())&&UserInfo.getUserId()==System.Label.ByPassTrigger){
+    if ((!Test.isRunningTest()) && UserInfo.getUserId() == System.Label.ByPassTrigger) {
         System.debug('enter ContentDocumentLink but UserInfo.getUserId()==System.Label.ByPassTrigger');
->>>>>>> LEXCommunityLiJun
         return;
     }
     system.debug('enter ContentDocumentLink');

--
Gitblit v1.9.1