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/classes/ResponseBodyLWCTest.cls | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/force-app/main/default/classes/ResponseBodyLWCTest.cls b/force-app/main/default/classes/ResponseBodyLWCTest.cls
index 686be82..9d07184 100644
--- a/force-app/main/default/classes/ResponseBodyLWCTest.cls
+++ b/force-app/main/default/classes/ResponseBodyLWCTest.cls
@@ -1,18 +1,15 @@
@isTest
public class ResponseBodyLWCTest {
- static testMethod void test1() {
- ResponseBodyLWC l1 = new ResponseBodyLWC();
- ResponseBodyLWC l2 = new ResponseBodyLWC(
- 'status',
- 200,
- 'testmsg',
- new Map<String, String>()
- );
- ResponseBodyLWC l3 = new ResponseBodyLWC(
- 'status',
- 200,
- 'testmsg',
- new List<Object>()
- );
- }
+ 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