# Conflicts:合并dev
#	egret/resource/default.res.json
#	egret/src/something/chapters/Chapter23.ts
#	egret/src/something/chapters/getChapter.ts