Skip to content
This repository was archived by the owner on Mar 23, 2023. It is now read-only.

Commit 2039f75

Browse files
author
Snoworange420
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # .gradle/4.9/fileHashes/fileHashes.bin # .gradle/4.9/fileHashes/fileHashes.lock
2 parents 7e2a658 + 86c9ce3 commit 2039f75

File tree

12 files changed

+18
-89
lines changed

12 files changed

+18
-89
lines changed
-1 Bytes
Binary file not shown.
-41.4 KB
Binary file not shown.
-17 Bytes
Binary file not shown.

.gradle/gradle.log

Lines changed: 0 additions & 1 deletion
This file was deleted.

.gradle/vcsWorkingDirs/gc.properties

Whitespace-only changes.

.idea/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/compiler.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/gradle.xml

Lines changed: 0 additions & 18 deletions
This file was deleted.

.idea/jarRepositories.xml

Lines changed: 0 additions & 45 deletions
This file was deleted.

.idea/misc.xml

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)