# Conflicts:
#	barbatruc/examples/cfd_cylinder.py
#	barbatruc/examples/cfd_poiseuille.py
#	barbatruc/fd_ns_2d.py
#	barbatruc/fd_operators.py
#	barbatruc/fluid_domain.py
#	docs/index.rst
#	setup.py