Fix merge conflict

Author: melix

native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/internal/BaseNativeImageOptions.java

@@ -156,15 +156,6 @@ public String getName() {
     @Input
     public abstract Property<Boolean> getDebug();
 
-    /**
-     * Returns the server property, used to determine if the native image
-     * build server should be used.
-     *
-     * @return the server property
-     */
-    @Input
-    public abstract Property<Boolean> getServer();
-
     /**
      * @return Whether to enable fallbacks (defaults to false).
      */
@@ -226,7 +217,6 @@ public BaseNativeImageOptions(String name,
                                   String defaultImageName) {
         this.name = name;
         getDebug().convention(false);
-        getServer().convention(false);
         getFallback().convention(false);
         getVerbose().convention(false);
         getAgent().convention(false);
@@ -367,16 +357,4 @@ public BaseNativeImageOptions runtimeArgs(Iterable<?> arguments) {
         );
         return this;
     }
-
-    /**
-     * Enables server build. Server build is disabled by default.
-     *
-     * @param enabled Value which controls whether the server build is enabled.
-     * @return this
-     */
-    public BaseNativeImageOptions enableServerBuild(boolean enabled) {
-        getServer().set(enabled);
-        return this;
-    }
-
 }

native-gradle-plugin/src/main/java/org/graalvm/buildtools/gradle/internal/DeprecatedNativeImageOptions.java

@@ -153,12 +153,6 @@ public Property<Boolean> getDebug() {
         return warnAboutDeprecation(delegate::getDebug);
     }
 
-    @Override
-    @Input
-    public Property<Boolean> getServer() {
-        return warnAboutDeprecation(delegate::getServer);
-    }
-
     @Override
     @Input
     public Property<Boolean> getFallback() {
@@ -250,9 +244,4 @@ public NativeImageOptions runtimeArgs(Object... arguments) {
     public NativeImageOptions runtimeArgs(Iterable<?> arguments) {
         return warnAboutDeprecation(() ->delegate.runtimeArgs(arguments));
     }
-
-    @Override
-    public NativeImageOptions enableServerBuild(boolean enabled) {
-        return warnAboutDeprecation(() -> delegate.enableServerBuild(enabled));
-    }
 }