解决冲突

MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java

@@ -229,13 +229,7 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
             startActivity(new Intent(getContext(), MyBagActivity.class));
         } else if (id==R.id.me_daily) {//每日任务
             startActivity(new Intent(getContext(), DailyTasksActivity.class));
-<<<<<<< HEAD
         } else if (id == R.id.iv_sz) {//设置
-            //            startActivity(new Intent(getContext(), SettingActivity.class));
-=======
-        }
-        else if (id == R.id.iv_sz) {//设置
->>>>>>> branch_new_dev
             Intent intent = new Intent(getContext(), SettingActivity.class);
             Bundle bundle = new Bundle();
             bundle.putSerializable("userInfo", userInfo);

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

gradle.properties

@@ -28,7 +28,6 @@ isBuildModule=false
 #org.gradle.deamon=false
 android.injected.testOnly=false
 
-APP_VERSION_NAME=1.0.6.4
 APP_VERSION_NAME=1.0.6.5
 APP_VERSION_CODE=54