From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/classes/ResponseBodyLWCTest.cls | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/classes/ResponseBodyLWCTest.cls b/force-app/main/default/classes/ResponseBodyLWCTest.cls
index 9d07184..e4ba53d 100644
--- a/force-app/main/default/classes/ResponseBodyLWCTest.cls
+++ b/force-app/main/default/classes/ResponseBodyLWCTest.cls
@@ -2,14 +2,7 @@
public class ResponseBodyLWCTest {
static testMethod void test1() {
ResponseBodyLWC l1 = new ResponseBodyLWC();
-<<<<<<< HEAD
ResponseBodyLWC l2 = new ResponseBodyLWC('status', 200, 'testmsg', new Map<String, String>());
ResponseBodyLWC l3 = new ResponseBodyLWC('status', 200, 'testmsg', new List<Object>());
}
}
-=======
- ResponseBodyLWC l2 = new ResponseBodyLWC('status',200,'testmsg',new Map<String,String>());
- ResponseBodyLWC l3 = new ResponseBodyLWC('status',200,'testmsg',new List<Object>());
- }
-}
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1