feat: 冲突解决

app/src/main/AndroidManifest.xml

@@ -592,10 +592,7 @@
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
 
-<<<<<<< HEAD
-=======
         <!--解除车牌占用-->
->>>>>>> ea3fbcd9fd029e789c3050032e53a5316c907094
         <activity
             android:name=".project.ui.activity.my.RemoveLicensePlateOccupation"
             android:launchMode="singleTop"
@@ -604,10 +601,7 @@
             android:name=".project.ui.activity.my.SuccessfulApplication"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
-<<<<<<< HEAD
 
-=======
->>>>>>> ea3fbcd9fd029e789c3050032e53a5316c907094
         <!--设备升级-->
         <activity
             android:name=".project.ui.activity.after.EquipmentUpgradeActivity"

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/fragment/FragmentHomeTow.java

@@ -199,17 +199,12 @@ public class FragmentHomeTow extends TitleBarFragment<MainActivity> {
                             break;
                         case "解除车牌占用":
                             jumpToPage(RemoveLicensePlateOccupation.class);
-<<<<<<< HEAD
-=======
                             break;
->>>>>>> ea3fbcd9fd029e789c3050032e53a5316c907094
                         case "设备升级":
                             jumpToPage(EquipmentUpgradeActivity.class);
                             break;
                         case "卡Pin码解锁":
                             jumpToPage(CardUnlockPinActivity.class);
-<<<<<<< HEAD
-=======
                             break;
                         case "满意度评价":
                             startActivity(UserEvaluateActivity.class);
@@ -219,7 +214,6 @@ public class FragmentHomeTow extends TitleBarFragment<MainActivity> {
                             break;
                         case "ETC过户":
                             jumpToPage(TransferOwnershipStep1Activity.class);
->>>>>>> ea3fbcd9fd029e789c3050032e53a5316c907094
                             break;
                         case "补卡额申请":
                             jumpToPage(ExtraCreditStep1Activity.class);