They do conflict. My version is slightly more complicated since it also supports nested mixed lists.
For example: 1. Here * is * an 2. example * of * a 3. mixed 4. list Which translates to: # Here #- is #- an # example #- of #- a # mixed # list Which is effectively the same as the example in the Confluence documentation: https://confluence.atlassian.com/confcloud/confluence-wiki-markup-724765099.html#ConfluenceWikiMarkup-Mixedlists -- Charles Durst cwdurst+orgm...@gmail.com On Thu, Dec 8, 2016 at 5:49 PM, Nicolas Goaziou <m...@nicolasgoaziou.fr> wrote: > Hello, > > Lungang Fang <lungang.f...@gmail.com> writes: > >> Attached is a patch for contrib/lisp/ox-confluence.el generated following >> instructions on http://orgmode.org/worg/org-contribute.html#patches . It >> adds support for ordered list. > > Thank you. > > However, this somewhat conflicts with a patch recently sent on the ML, > but not yet applied, by Charles Durst (Cc'ed). > > Could one double-check if one doesn't supersede the other, or if they > could be merged (although I suspect the former) and report back so > I know what patch to apply? > > Regards, > > -- > Nicolas Goaziou
