new file: conflict.md

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

chapter1.txt
About.txt
chapter2.txt
chapter2-2.txt
1.txt
2.txt
conflict.md
conflict
# conflict.md

Write here...