Fix rebase conflict

apache · Dec 29, 2023 · d556107 · d556107
1 parent 762bc24
commit d556107
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/...ia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSink.java b/...ia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSink.java
@@ -729,10 +729,6 @@ public void nonBreakingSpace() {
 
     @Override
     public void text(String text, SinkEventAttributes attributes) {
-<<<<<<< Upstream, based on master
-=======
-        // evaluate attributes
->>>>>>> 851bc35 [DOXIA-714] Emit proper markdown for table alignment and figures
         if (attributes != null) {
             inline(attributes);
         }