# Conflicts: # app/src/main/java/com/gh/gamecenter/game/GameItemViewHolder.kt # app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalAdapter.kt # app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt # app/src/main/java/com/gh/vspace/VDownloadManagerAdapter.kt # module_common/src/main/java/com/gh/gamecenter/common/view/DrawableView.kt