# Conflicts:
#	Makefile.in
#	examples/isqrt_von_neumann/why3session.xml
#	examples/residual/why3session.xml
#	examples/verifythis_fm2012_LRS/why3session.xml
#	examples/verifythis_fm2012_LRS/why3shapes.gz
#	examples/vstte12_ring_buffer/why3session.xml
#	src/core/pretty.ml