Commit 5f45787
Merge remote-tracking branch 'origin/main'
# Conflicts:
# .gradle/7.1/executionHistory/executionHistory.bin
# .gradle/7.1/executionHistory/executionHistory.lock
# .gradle/7.1/fileHashes/fileHashes.bin
# .gradle/7.1/fileHashes/fileHashes.lock
# .gradle/buildOutputCleanup/buildOutputCleanup.lock
# .gradle/buildOutputCleanup/outputFiles.bin
# .gradle/checksums/checksums.lock
# .gradle/checksums/md5-checksums.bin
# .gradle/checksums/sha1-checksums.bin
# CHANGELOG.mdFile tree
10 files changed
+2
-0
lines changed- .gradle
- 7.1
- executionHistory
- fileHashes
- buildOutputCleanup
- checksums
10 files changed
+2
-0
lines changedBinary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
4 | 5 | | |
5 | 6 | | |
6 | 7 | | |
| 8 | + | |
7 | 9 | | |
8 | 10 | | |
9 | 11 | | |
| |||
0 commit comments