# Conflicts: # pages/person/certification/addcertification/index.wxml # pages/person/certification/certificationmanage/index.wxml # pages/tab/me/me.wxml # project.config.json # utils/util.js