Fix accidental commit of merge conflict

Author: cwickham

docs/authoring/tables.qmd

@@ -589,13 +589,9 @@ Markdown supports specification of alignment by column, but does not allow setti
 
 It's possible that Quarto's processing of HTML tables may interfere with the HTML produced computationally with table packages in R and Python (or other supported languages).
 
-<<<<<<< HEAD
-=======
-
 When you disable Quarto's HTML table processing, tables are not translated to Markdown, will not be rendered to other output formats, and can not use Quarto Markdown features, like cross-references, shortcodes, etc.
 The tables also won't be visible to Lua filters that act on `Table` nodes.
 
->>>>>>> ffe339482 (Merge similar paragraphs)
 You can disable Quarto's HTML table processing at a document level or project level with the option `html-table-processing`:
 
 ```{.yaml}