# Conflicts: # .idea/compiler.xml # .idea/discord.xml # .idea/misc.xml # gradle/wrapper/gradle-wrapper.jar # gradle/wrapper/gradle-wrapper.properties # gradlew