# Conflicts: # egret/resource/default.res.json 合并loading，调整引导
Attach a file by drag & drop or click to upload
http://gitlab2.dui88.com/wanghongyuan/xiaoxiaolezjz1994 authored