# Conflicts: # app/build.gradle # app/src/main/java/com/bgycc/smartcanteen/activity/MainActivity.java # build.gradle
Merge branch 'develop' into fea-phone · 090ceca0