合并

2025-11-27 11:59:19 +08:00
parent fe1ad2a732
commit fe9e192aea
3 changed files with 1 additions and 17 deletions
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
@@ -24,13 +24,9 @@ import android.widget.LinearLayout;
 import android.widget.TextView;

 import com.alibaba.android.arouter.launcher.ARouter;
-<<<<<<< HEAD
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.xscm.modulemain.Application;
-=======
-import com.blankj.utilcode.util.LogUtils;
->>>>>>> branch_new_dev
 import com.xscm.modulemain.R;
 import com.xscm.modulemain.activity.room.contacts.RoomUserContacts;
 import com.xscm.modulemain.activity.user.activity.GiftWallActivity;