Conflicts: .idea/.gitignore .idea/compiler.xml .idea/encodings.xml .idea/jarRepositories.xml .idea/misc.xml logs/error.log logs/info.log
# Conflicts: # kqapi/src/main/java/com/ningdatech/kqapi/common/helper/basic/AbstractMatterCacheHelper.java