解决冲突

2021-05-26 18:47:39 +08:00
parent 26d444cbf8 9bbe6ead62
commit 80893ca08f
33 changed files with 249 additions and 72 deletions
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    tools:context=".activity.HomeActivity">
+    tools:context="activity.HomeActivity">

    <com.example.myapplication.util.NoSlideViewPager
        android:id="@+id/no_slide_view_pager"