YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'master/dev-lxj-beta' into dev-lxj-beta

Browse Source 
# Conflicts:
#	moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt
This commit is contained in:
梁小江
2025-11-12 11:35:29 +08:00
parent ec58f46bf8 c592da4d55
commit ee06345de7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/vcs.xml generated
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/yusheng-android" vcs="Git" />
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>