Commit f7f970fa938b646d3d16b4383c7867669aca17bf
1 parent
c386c2da
Merge branch 'master' of http://bj.gitlab.cnlive.com/cnlive-team/ModulePedometer
# Conflicts: # moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
Showing
1 changed file
with
2 additions
and
0 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java