Resolving conflicts between 'master' and 'cirosantilli1'

Ciro Santilli Puppet 1 authored
revision 207f1be8c4add6a62d7dbdebebb1c974a3d6d9d7
# 2

4
5
6
multi
# 2

4
a5b
6
# 3.txt

a
Contents
> These files will be included in your book:

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