# Conflicts: # app/src/main/java/com/jiejing/fitness/finance/app/FitnessFinanceApplication.java
Feature/mini pay See merge request !2