-
# Conflicts: # app/src/main/java/com/yinhebairong/clasmanage/ui/AudioAndVideoPlayActivity2.java
-
# Conflicts: # qrcodecore/build/intermediates/incremental/packageDebugResources/compile-file-map.properties # zxing/build/intermediates/incremental/packageDebugResources/compile-file-map.properties