resolve conflict

dragonwell-project · Jan 22, 2024 · e1a44dc · e1a44dc
1 parent 5434e6b
commit e1a44dc
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java
@@ -60,13 +60,10 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Stream;
 
-<<<<<<< HEAD
 import com.alibaba.rcm.internal.AbstractResourceContainer;
 import com.alibaba.wisp.engine.WispEngine;
 import com.alibaba.wisp.engine.WispTask;
-=======
 import jdk.internal.logger.LoggerFinderLoader.TemporaryLoggerFinder;
->>>>>>> jdk-11.0.22+7
 import jdk.internal.util.StaticProperty;
 import jdk.internal.module.ModuleBootstrap;
 import jdk.internal.module.ServicesCatalog;