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/aura/CreateTarget/CreateTarget.cmp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/aura/CreateTarget/CreateTarget.cmp b/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
index 3bd31c0..a863006 100644
--- a/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
+++ b/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
@@ -639,4 +639,4 @@
     aura:id="modal_bg"
     class="disp_none slds-backdrop slds-backdrop--open"
   ></div>
-</aura:component>
+</aura:component>
\ No newline at end of file

--
Gitblit v1.9.1