[EagerAppCDS] fix merge conflicts

Summary: as title Testing: test/hotspot/jtreg/runtime/appcds/TestCommon.java Reviewers: lingjun-cg, yulei Issue:
dragonwell-project · Dec 11, 2023 · a1ba06d · a1ba06d
1 parent 6418a5c
commit a1ba06d
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/test/hotspot/jtreg/runtime/appcds/TestCommon.java b/test/hotspot/jtreg/runtime/appcds/TestCommon.java
@@ -199,12 +199,7 @@ public static OutputAnalyzer runWithArchive(AppCDSOptions opts)
             }
         }
 
-<<<<<<< HEAD
-        String[] cmdLine = cmd.toArray(new String[cmd.size()]);
-        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true, makeCommandLineForAppCDS(cmdLine));
-=======
         ProcessBuilder pb = ProcessTools.createTestJvm(cmd);
->>>>>>> jdk-11.0.21+9
         return executeAndLog(pb, "exec");
     }