diff options
| author | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2019-03-18 21:56:14 +0300 |
|---|---|---|
| committer | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2019-03-18 21:56:14 +0300 |
| commit | 4b22ebab09ce3b934443d063df6b905e5347c390 (patch) | |
| tree | f353662dc777107773adf8a5b3cac07b09ab3255 /runners/gradle-integration-tests/testData/androidMultiFlavourApp/fileTree.txt | |
| parent | 0fa9b69b6afe762e5aee7b7cf801a38ebe74b2c9 (diff) | |
| parent | b566f8852e94f9a17be86bf845aeff6c36bd8378 (diff) | |
| download | dokka-4b22ebab09ce3b934443d063df6b905e5347c390.tar.gz dokka-4b22ebab09ce3b934443d063df6b905e5347c390.tar.bz2 dokka-4b22ebab09ce3b934443d063df6b905e5347c390.zip | |
Merge branch 'dev-pre' into dev
# Conflicts:
# core/src/main/kotlin/Model/PackageDocs.kt
Diffstat (limited to 'runners/gradle-integration-tests/testData/androidMultiFlavourApp/fileTree.txt')
| -rw-r--r-- | runners/gradle-integration-tests/testData/androidMultiFlavourApp/fileTree.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runners/gradle-integration-tests/testData/androidMultiFlavourApp/fileTree.txt b/runners/gradle-integration-tests/testData/androidMultiFlavourApp/fileTree.txt index 5e969d8b..77b563b2 100644 --- a/runners/gradle-integration-tests/testData/androidMultiFlavourApp/fileTree.txt +++ b/runners/gradle-integration-tests/testData/androidMultiFlavourApp/fileTree.txt @@ -10,6 +10,7 @@ -init-.html index.html on-create-options-menu.html + on-create.html -kotlin-activity/ -init-.html index.html @@ -35,6 +36,7 @@ -init-.html index.html on-create-options-menu.html + on-create.html -kotlin-activity/ -init-.html index.html |