# Conflicts: # scr/food/app.json
# Conflicts: # scr/food/pages/login/login.js
# Conflicts: # scr/miniprogram-2/project.config.json # scr/论坛/project.config.json
model/2.txt other/3.txt scr/2.txt