resolve merge conflicts

This commit is contained in:
dfsek
2021-05-09 22:28:52 -07:00
parent 526049523f
commit 97aa9d9a91
4 changed files with 7 additions and 20 deletions
+1 -1
View File
@@ -7,4 +7,4 @@ org.gradle.parallel=true
org.gradle.caching=true
org.gradle.warning.mode=all
#org.gradle.logging.level=info
org.gradle.configureondemand=true
#org.gradle.configureondemand=true