new file: conflict2.md

Ciro Santilli authored
revision d33cf12a496dce777d00d9dc210a8dbe28ea555b
Contents
> These files will be included in your book:

chapter1.txt
About.txt
chapter2-2.txt
1.txt
2.txt
conflict.md
chapter2.txt
23.txt
3.txtconflict2.md
conflict2
# conflict2.md

Write here...