new file: conflict3.md

Ciro Santilli Puppet 1 authored
revision 09bf4419d3f31fe1cefbd65af3a7d142e051a042
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
conflict3.md
conflict3
# conflict3.md

Write here...