97eeb78d03
# Conflicts: # BauSystem_Main/src/BauSystem.properties |
||
---|---|---|
BauSystem_15 | ||
BauSystem_API | ||
BauSystem_Main | ||
gradle/wrapper | ||
yapion | ||
.gitignore | ||
build.gradle | ||
BUILDING.md | ||
gradle.properties | ||
gradlew | ||
gradlew.bat | ||
ignoredlog | ||
LICENCE.txt | ||
README.md | ||
settings.gradle |