# Conflicts: # app/src/main/java/com/gh/common/view/RichEditor.java # app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerViewModel.kt
# Conflicts: # app/src/main/java/com/gh/common/view/RichEditor.java # app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerViewModel.kt