#24738 solve conflict

dotCMS · Jun 30, 2023 · a7070fe · a7070fe
1 parent e4a7883
commit a7070fe
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/dotCMS/src/integration-test/java/com/dotcms/MainSuite2a.java b/dotCMS/src/integration-test/java/com/dotcms/MainSuite2a.java
@@ -1,13 +1,5 @@
 package com.dotcms;
 
-import com.dotcms.auth.providers.saml.v1.DotSamlResourceTest;
-import com.dotcms.auth.providers.saml.v1.SAMLHelperTest;
-import com.dotcms.cache.lettuce.DotObjectCodecTest;
-import com.dotcms.cache.lettuce.LettuceCacheTest;
-import com.dotcms.cache.lettuce.RedisClientTest;
-import com.dotcms.content.business.ObjectMapperTest;
-import com.dotcms.content.business.json.ContentletJsonAPITest;
-import com.dotcms.content.elasticsearch.business.ESIndexAPITest;
 import com.dotcms.content.elasticsearch.business.ElasticsearchUtilTest;
 import com.dotcms.content.elasticsearch.util.ESMappingUtilHelperTest;
 import com.dotcms.contenttype.business.DotAssetBaseTypeToContentTypeStrategyImplTest;