From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict

---
 force-app/main/default/triggers/EventOpportunityPileUp.trigger |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/force-app/main/default/triggers/EventOpportunityPileUp.trigger b/force-app/main/default/triggers/EventOpportunityPileUp.trigger
index 450c456..e421586 100644
--- a/force-app/main/default/triggers/EventOpportunityPileUp.trigger
+++ b/force-app/main/default/triggers/EventOpportunityPileUp.trigger
@@ -1,5 +1,4 @@
 trigger EventOpportunityPileUp on Event (after delete, after insert, after update) {
-
     List<String> oppIds = new List<String>();
     if (Trigger.isDelete) {
         List<SFDelete__c> dlist = new List<SFDelete__c>();
@@ -62,7 +61,4 @@
 System.debug('EscapeSyncOpportunityTrigger:::::' + StaticParameter.EscapeSyncOpportunityTrigger);
         ControllerUtil.updOppList(opps);
     }
-
-
-
 }
\ No newline at end of file

--
Gitblit v1.9.1