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/LexUtilityTest.cls |   14 --------------
 1 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/force-app/main/default/classes/LexUtilityTest.cls b/force-app/main/default/classes/LexUtilityTest.cls
index 39e618b..445376c 100644
--- a/force-app/main/default/classes/LexUtilityTest.cls
+++ b/force-app/main/default/classes/LexUtilityTest.cls
@@ -1,31 +1,17 @@
 @IsTest
 private class LexUtilityTest {
     @IsTest
-<<<<<<< HEAD
     static void testMethod1() {
         User currentUser = [SELECT Id FROM User WHERE Id = :UserInfo.getUserId()];
         NoteStay__c n = new NoteStay__c(Name = 'NoteStay', IsStay__c = true);
-=======
-    static void testMethod1(){
-        User currentUser = [SELECT Id FROM User WHERE Id = :UserInfo.getUserId()];
-        NoteStay__c n = new NoteStay__c(Name = 'NoteStay',IsStay__c = true);
->>>>>>> LEXCommunityLiJun
         insert n;
         LicenceReminderDate__c l = new LicenceReminderDate__c(Name = '180Days', ReminderDays__c = 180);
         insert l;
         Test.startTest();
-<<<<<<< HEAD
         System.runAs(currentUser) {
-=======
-        System.runAs(currentUser){
->>>>>>> LEXCommunityLiJun
             LexUtility.getIsNoteStay();
             LexUtility.getLicenceReminderDays();
         }
         Test.stopTest();
     }
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> LEXCommunityLiJun

--
Gitblit v1.9.1