# Conflicts:
#	dokka.iml
#	javadoc/javadoc.iml
#	javadoc/src/main/kotlin/docbase.kt
#	javadoc/src/main/kotlin/dokka-adapters.kt
#	javadoc/src/main/kotlin/reporter.kt
#	javadoc/src/main/kotlin/tags.kt
#	src/Analysis/AnalysisEnvironment.kt
#	src/Analysis/CompilerAPI.kt
#	src/Formats/KotlinWebsiteFormatService.kt
#	src/Formats/StructuredFormatService.kt
#	src/Java/JavaDocumentationBuilder.kt
#	src/Kotlin/ContentBuilder.kt
#	src/Kotlin/DocumentationBuilder.kt
#	src/Languages/JavaLanguageService.kt
#	src/Model/Content.kt
#	src/Model/PackageDocs.kt
#	src/Utilities/GuiceModule.kt
#	src/Utilities/Path.kt
#	src/Utilities/ServiceLocator.kt
#	test/src/markdown/MarkdownTestRunner.kt