Fix conflicts

asciidoctor · Jun 15, 2023 · 89712c1 · 89712c1
1 parent b108505
commit 89712c1
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/asciidoctor-maven-plugin/src/main/java/org/asciidoctor/maven/AsciidoctorMojo.java b/asciidoctor-maven-plugin/src/main/java/org/asciidoctor/maven/AsciidoctorMojo.java
@@ -387,11 +387,7 @@ protected OptionsBuilder createOptionsBuilder(AsciidoctorMojo configuration, Att
         final OptionsBuilder optionsBuilder = Options.builder()
                 .backend(configuration.getBackend())
                 .safe(SafeMode.UNSAFE)
-<<<<<<< HEAD
                 .standalone(configuration.standalone)
-=======
-                .standalone(configuration.isHeaderFooter())
->>>>>>> 63b2278 (Fix standalone option)
                 .mkDirs(true);
 
         if (!isBlank(configuration.getEruby()))