解决合并
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@mipmap/bg"
|
||||
tools:context="activity.LoginActivity">
|
||||
|
||||
<TextView
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:background="@mipmap/bg"
|
||||
tools:context=".fragment.ForgetPawFragment">
|
||||
<include layout="@layout/register_title" android:id="@+id/forgetPaw"/>
|
||||
<TextView
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:background="@mipmap/bg"
|
||||
tools:context=".fragment.RegisterFragment">
|
||||
|
||||
<include layout="@layout/register_title"
|
||||
|
||||
Reference in New Issue
Block a user