diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-10-03 16:00:26 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-12-12 12:23:18 +0100 |
| commit | 80d0c9c89007000ff86ab909a2a3662cab8a8ba4 (patch) | |
| tree | 1bc8d2fdbfe57c903a4660bbdb3129dbf4573454 /docs/changelog | |
| parent | 8475c8d481208f1fa501de46e35f5a43fcddce4c (diff) | |
| download | Ishtar-80d0c9c89007000ff86ab909a2a3662cab8a8ba4.tar.bz2 Ishtar-80d0c9c89007000ff86ab909a2a3662cab8a8ba4.zip | |
Fix bad merge for changelog docs
Diffstat (limited to 'docs/changelog')
| -rw-r--r-- | docs/changelog/css/combo.css | 3 | ||||
| -rw-r--r-- | docs/changelog/template.html | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/docs/changelog/css/combo.css b/docs/changelog/css/combo.css index 5e2eafa2b..a53207390 100644 --- a/docs/changelog/css/combo.css +++ b/docs/changelog/css/combo.css @@ -889,12 +889,9 @@ 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; } -======= ->>>>>>> 9cba51606 (Generate html CHANGELOG) diff --git a/docs/changelog/template.html b/docs/changelog/template.html index 7fe4d754d..309f517ce 100644 --- a/docs/changelog/template.html +++ b/docs/changelog/template.html @@ -9,12 +9,9 @@ <link rel="stylesheet" href="css/combo.css"> </head> <body> -<<<<<<< HEAD -======= <div class="container center"> <p><a href="https://www.iggdrasil.net"><img src="img/iggdrasil.png"></a></p> </div> ->>>>>>> 9cba51606 (Generate html CHANGELOG) <div class='container'> $body$ </div> |