# Conflicts: # core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java # gradle.properties