[EagerAppCDS] fix merge conflicts

dragonwell-project / dragonwell11

Alibaba Dragonwell11 JDK

https://www.aliyun.com/product/dragonwell

GNU General Public License v2.0

558 stars 115 forks source link

Closed jia-wei-tang closed 10 months ago

jia-wei-tang commented 10 months ago

Summary: as title

Testing: test/hotspot/jtreg/runtime/appcds/TestCommon.java

Reviewers: lingjun-cg, yulei

Issue: