# Conflicts:
#	src/api-server/model/AccessTokenErr.cpp
#	src/api-server/model/AccessTokenReq.cpp
#	src/api-server/model/PatchOperation.cpp
#	src/common/model/common/CellGlobalId.cpp
#	src/pcf_app/CMakeLists.txt