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/LexConsumableAccountInfoControllerTest.cls | 19 -------------------
1 files changed, 0 insertions(+), 19 deletions(-)
diff --git a/force-app/main/default/classes/LexConsumableAccountInfoControllerTest.cls b/force-app/main/default/classes/LexConsumableAccountInfoControllerTest.cls
index 3b43a92..4f063ca 100644
--- a/force-app/main/default/classes/LexConsumableAccountInfoControllerTest.cls
+++ b/force-app/main/default/classes/LexConsumableAccountInfoControllerTest.cls
@@ -1,35 +1,16 @@
@isTest
private class LexConsumableAccountInfoControllerTest {
-<<<<<<< HEAD
@isTest
public static void test_method_one() {
// Implement test code
Account account1 = new Account();
account1.Name = 'test1鍖婚櫌';
-=======
-
- @isTest
- public static void test_method_one() {
- // Implement test code
- Account account1 = new Account();
- account1.Name = 'test1鍖婚櫌';
->>>>>>> LEXCommunityLiJun
account1.RecordTypeId = '01210000000QemG';
//account1.Is_Active__c = '鑽夋涓�';
insert account1;
-<<<<<<< HEAD
LexConsumableAccountInfoController cai = new LexConsumableAccountInfoController();
LexConsumableAccountInfoController.init(account1.Id);
LexConsumableAccountInfoController.init('');
}
}
-=======
-
- LexConsumableAccountInfoController cai = new LexConsumableAccountInfoController();
- LexConsumableAccountInfoController.init(account1.Id);
- LexConsumableAccountInfoController.init('');
- }
-
-}
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1