解决冲突

2025-11-22 11:27:23 +08:00
parent 95a1e21909
commit 18b1235a80
3 changed files with 0 additions and 11 deletions
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
@@ -123,10 +123,6 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
        if (userInfo != null) {
            LogUtils.e("RoomGiftDialogFragment_userInfo", userInfo.toString());
        }
-<<<<<<< HEAD
-=======
-
->>>>>>> branch_new_dev
    }

    @Override