resolved conflicts

This commit is contained in:
heyethereum
2024-07-12 08:21:13 +08:00
5 changed files with 30 additions and 24 deletions

5
.gitignore vendored
View File

@@ -4,6 +4,9 @@ target/
!**/src/main/**/target/
!**/src/test/**/target/
.DS_Store
*/.DS_Store
**/.DS_Store
### STS ###
.apt_generated
.classpath
@@ -35,3 +38,5 @@ build/
### VS Code ###
.vscode/