-
# Conflicts: # moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RaceRecorFragment.java
-
# Conflicts: # lib_network/src/main/java/com/cnlive/strike/data/network/api/ApiServiceDaren.java
-
# Conflicts: # moudle_pedometer/src/main/res/drawable-hdpi/more.png # moudle_pedometer/src/main/res/drawable-xhdpi/more.png # moudle_pedometer/src/main/res/drawable-xxhdpi/more.png
-
# Conflicts: # moudle_pedometer/src/main/res/values/strings.xml