Hello everyone,

I am a user of kjambunathan's org-mode-ox-odt. The odt exporter needs some
changed in the upstream org mode. Can you please kindly review the request?
Thank you so much!

diff --cc lisp/org-element.el
index cdb574e17,f7498fbd1..000000000
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@@ -307,12 -322,11 +322,20 @@@ Don't modify it, set `org-element-affil
        (strike-through ,@standard-set)
        (subscript ,@standard-set)
        (superscript ,@standard-set)
++<<<<<<< HEAD
 +      ;; Ignore inline babel call and inline source block as formulas
 +      ;; are possible.  Also ignore line breaks and statistics
 +      ;; cookies.
 +      (table-cell bold code entity export-snippet footnote-reference italic
 +                latex-fragment link macro radio-target strike-through
 +                subscript superscript target timestamp underline verbatim)
++=======
+       ;; Ignore inline babel call and inline src block as formulas are
+       ;; possible.  Also ignore line breaks and statistics cookies.
+       (table-cell ,@(append '(export-snippet footnote-reference link macro
+                                            radio-target target timestamp)
+                           minimal-set))
++>>>>>>> origin/wip-cite
        (table-row table-cell)
        (underline ,@standard-set)
        (verse-block ,@standard-set)))