From 64e600b126ae8edcfbb3c2716febb01d221520b5 Mon Sep 17 00:00:00 2001 From: Kamil Doległo Date: Tue, 14 Apr 2020 14:14:31 +0200 Subject: Fix path clash with top-level declarations, catch link resolving exception, remove default values while merging, merge expect by targets --- .../expect/sinceKotlin/out/html/navigation.html | 6 +-- .../html/root//available-since1.1.html | 30 +++++++++++ .../out/html/root//index.html | 44 ++++++++++++++++ .../out/html/root/available-since1.1.html | 30 ----------- .../expect/sinceKotlin/out/html/root/index.html | 23 ++++----- .../expect/sinceKotlin/out/html/scripts/main.js | 59 ++++++++++++++++++++++ .../sinceKotlin/out/html/scripts/main.js.map | 1 + .../expect/sinceKotlin/out/html/scripts/pages.js | 4 +- 8 files changed, 149 insertions(+), 48 deletions(-) create mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/root//available-since1.1.html create mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/root//index.html delete mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/available-since1.1.html create mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/scripts/main.js create mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/scripts/main.js.map (limited to 'plugins/base/src/test/resources/expect/sinceKotlin') diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/navigation.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/navigation.html index 176e51b8..96a19bec 100644 --- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/navigation.html +++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/navigation.html @@ -1,9 +1,9 @@