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

Merge branch 'dev-lxj-beta' into dev-lxj

Browse Source 
# Conflicts:
#	.idea/.name
#	.idea/vcs.xml
This commit is contained in:
梁小江
2025-11-05 11:25:39 +08:00
parent 773c3fc8b4 d0337a723c
commit c1d77850f1
47 changed files with 418 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/.gitignore generated vendored
View File

@@ -1,3 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml

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$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/yusheng-android" vcs="Git" />
</component>
</project>