# Conflicts: # app/src/main/java/com/ydl/component/MainActivity.kt # m-dynamic/src/main/java/com/yidianling/dynamic/publishTrend/fragment/PublishQuestionAndTrendFragment.java # ydl-platform/src/main/java/com/ydl/ydlcommon/utils/log/LogHelper.kt # ydl-platform/src/main/java/com/ydl/ydlcommon/view/banner/GlideImageDisplayLoader.java
