resolve conflicts

Author: marwan-hallaoui

make/common/Modules.gmk

@@ -64,11 +64,8 @@ ifeq ($(INCLUDE_JVMCI), false)
   MODULES_FILTER += jdk.internal.vm.ci
   MODULES_FILTER += jdk.graal.compiler
   MODULES_FILTER += jdk.graal.compiler.management
-<<<<<<< HEAD
   MODULES_FILTER += jdk.compiler.graal
   MODULES_FILTER += jdk.compiler.graal.management
-=======
->>>>>>> jdk-22+22
 endif
 
 # jpackage is only on windows, macosx, and linux

make/conf/module-loader-map.conf

@@ -62,11 +62,8 @@ UPGRADEABLE_PLATFORM_MODULES= \
     java.compiler \
     jdk.graal.compiler \
     jdk.graal.compiler.management \
-<<<<<<< HEAD
     jdk.compiler.graal \
     jdk.compiler.graal.management \
-=======
->>>>>>> jdk-22+22
     #
 
 PLATFORM_MODULES= \

src/java.base/share/lib/security/default.policy

@@ -167,7 +167,6 @@ grant codeBase "jrt:/jdk.graal.compiler" {
     permission java.security.AllPermission;
 };
 
-<<<<<<< HEAD
 grant codeBase "jrt:/jdk.graal.compiler" {
     permission java.security.AllPermission;
 };
@@ -176,8 +175,6 @@ grant codeBase "jrt:/jdk.compiler.graal" {
     permission java.security.AllPermission;
 };
 
-=======
->>>>>>> jdk-22+22
 grant codeBase "jrt:/jdk.jsobject" {
     permission java.security.AllPermission;
 };

src/jdk.internal.vm.ci/share/classes/module-info.java

@@ -26,7 +26,6 @@
 module jdk.internal.vm.ci {
     exports jdk.vm.ci.services to
         jdk.graal.compiler,
-<<<<<<< HEAD
         jdk.graal.compiler.management,
         jdk.compiler.graal,
         jdk.compiler.graal.management;
@@ -38,15 +37,13 @@
     exports jdk.vm.ci.meta to jdk.graal.compiler, jdk.compiler.graal;
     exports jdk.vm.ci.code to jdk.graal.compiler, jdk.compiler.graal;
     exports jdk.vm.ci.hotspot to jdk.graal.compiler, jdk.compiler.graal;
-=======
         jdk.graal.compiler.management;
     exports jdk.vm.ci.runtime to
         jdk.graal.compiler,
         jdk.graal.compiler.management;
     exports jdk.vm.ci.meta to jdk.graal.compiler;
     exports jdk.vm.ci.code to jdk.graal.compiler;
     exports jdk.vm.ci.hotspot to jdk.graal.compiler;
->>>>>>> jdk-22+22
 
     uses jdk.vm.ci.services.JVMCIServiceLocator;
     uses jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory;