From d5d541f6bc23fd70875bbc706639b7e48d50468a Mon Sep 17 00:00:00 2001
From: Guo_shaoshan <2055829622@qq.com>
Date: 星期二, 04 四月 2023 20:36:41 +0800
Subject: [PATCH] 更改解决冲突
---
app/src/main/res/layout/fragment_home.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index d439c25..64bd7b6 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -6,7 +6,7 @@
<data>
<variable
name="viewModel"
- type="com.application.zhangshi_app_android.module.home.HomeFragmentViewModel" />
+ type="com.application.zhangshi_app_android.ui.home.HomeFragmentViewModel" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout
--
Gitblit v1.9.1