# Conflicts: # config.gradle # m-user/src/main/java/com/yidianling/user/mine/MineFragment.java # m-user/src/main/res/layout/user_mine_fragment_mine.xml
