Conflicts:
	library/SpatialDomains/Conditions.h

Conflicts:
	solvers/ADRSolver/CMakeLists.txt

Conflicts:
	library/LocalRegions/Expansion3D.h
	library/MultiRegions/ExpList.cpp
	library/SpatialDomains/GeomFactors.cpp
	library/SpatialDomains/GeomFactors.h
	library/SpatialDomains/GeomFactors1D.cpp
	library/SpatialDomains/GeomFactors1D.h
	library/SpatialDomains/GeomFactors2D.cpp
	library/SpatialDomains/GeomFactors2D.h
	library/SpatialDomains/GeomFactors3D.cpp
	library/SpatialDomains/GeomFactors3D.h
	library/SpatialDomains/Geometry.h
	library/SpatialDomains/Geometry1D.cpp
	library/SpatialDomains/Geometry1D.h
	library/SpatialDomains/Geometry2D.cpp
	library/SpatialDomains/Geometry2D.h
	library/SpatialDomains/Geometry3D.cpp
	library/SpatialDomains/Geometry3D.h
	library/SpatialDomains/HexGeom.cpp
	library/SpatialDomains/PrismGeom.cpp
	library/SpatialDomains/PyrGeom.cpp
	library/SpatialDomains/QuadGeom.cpp
	library/SpatialDomains/SegGeom.cpp
	library/SpatialDomains/SegGeom.h
	library/SpatialDomains/TetGeom.cpp
	library/SpatialDomains/TriGeom.cpp
	utilities/PostProcessing/Extras/CMakeLists.txt
	utilities/PostProcessing/XmlToTecplot.cpp