]> git.puffer.fish Git - matthieu/nova.git/commitdiff
fix conflict
authorMatthieuCoder <matthieu@matthieu-dev.xyz>
Mon, 16 Jan 2023 11:43:41 +0000 (15:43 +0400)
committerMatthieuCoder <matthieu@matthieu-dev.xyz>
Mon, 16 Jan 2023 11:43:41 +0000 (15:43 +0400)

Trivial merge