# Conflicts:
#	src/system/CMakeLists.txt
#	src/system/detail/CMakeLists.txt
#	src/system/lite/CMakeLists.txt
#	src/util/inc/textbuffer.h
#	src/vnode/detail/inc/vnodeTagMgmt.h
#	src/vnode/detail/src/vnodeQueryImpl.c
#	src/vnode/detail/src/vnodeSupertableQuery.c