diff options
Diffstat (limited to 'docs/changelog/css')
| -rw-r--r-- | docs/changelog/css/combo.css | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/changelog/css/combo.css b/docs/changelog/css/combo.css index 1a41b8c9d..5e2eafa2b 100644 --- a/docs/changelog/css/combo.css +++ b/docs/changelog/css/combo.css @@ -889,9 +889,12 @@ nav ul li:hover, nav ul li.active { } } +<<<<<<< HEAD body { background-image: url("https://ishtar-archeo.net/changelog/img/iggdrasil.png"); background-repeat: no-repeat; background-position: calc(100% - 20px) 20px; margin: 40px; -}
\ No newline at end of file +} +======= +>>>>>>> 9cba51606 (Generate html CHANGELOG) |