diff options
Diffstat (limited to 'docs/changelog/template.html')
| -rw-r--r-- | docs/changelog/template.html | 6 | 
1 files changed, 6 insertions, 0 deletions
| diff --git a/docs/changelog/template.html b/docs/changelog/template.html index 2a6361ba7..7fe4d754d 100644 --- a/docs/changelog/template.html +++ b/docs/changelog/template.html @@ -9,6 +9,12 @@      <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> | 
