resolve merge conflict

This commit is contained in:
revsuine 2024-11-25 17:07:22 +00:00
commit f7bb0bf346
Signed by: revsuine
GPG key ID: 3F257B68F5BC9339
3 changed files with 98 additions and 1 deletions

View file

@ -7,6 +7,8 @@ Generated with <a href="https://gohugo.io/">Hugo</a>. Website source available
<a href="https://www.gnu.org/licenses/gpl-3.0.txt">GNU General Public Licence v3</a>. <a
href="https://github.com/panr/hugo-theme-terminal">Theme</a> by <a href="https://github.com/panr/">panr</a>, which is
licensed under the <a href="https://github.com/panr/hugo-theme-terminal/blob/master/LICENSE.md">MIT licence</a>.</p>
<p align="center"><a href="/privacy_policy">Privacy Policy</a></p>
</footer>
<!-- REQUIRED FOR PRISMJS: -->