new file: conflict2.md

Ciro Santilli Puppet 1 authored
revision 863cc8ba2a31b52afec2489cb890ba256658f9ea
Contents
> These files will be included in your book:

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

Write here...