Fix remaining git conflicts after last rework of reactiveProgramming.adoc
Fix remaining git conflicts after last rework of reactiveProgramming.adoc

There were two conflicts in the reactiveProgramming file, one of which was doing awful thing to Asciidoctor's formatting. I fixed them.
reactor/reactor-core,sdeleuze/reactor-core,sdeleuze/reactor-core,sdeleuze/reactor-core,sdeleuze/reactor-core