Konflikte lösen
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,5 +1,5 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
/.gradle
|
||||
Happy_Bird/.gradle
|
||||
/build
|
Reference in New Issue
Block a user