-
# Conflicts: # .idea/gradle.xml # .idea/misc.xml # app/src/main/java/com/hh/xuetubao/adapter/JobHuntCompanyAdapter.java
-
# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/com/hh/xuetubao/activity/pratice/AnswerActivity.java # app/src/main/java/com/hh/xuetubao/activity/pratice/MockExamActivity.java # app/src/main/java/com/hh/xuetubao/adapter/ListRecGroupAdapter.java # app/src/main/res/layout/activity_answer_sheet.xml # app/src/main/res/layout/rv_listgroup.xml