]> git.puffer.fish Git - matthieu/nova.git/commit
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)
commit4635ae3076664828ccc20a211f70c5befdd022ea
treeb1468081a32546e8d01fba622f978cdd326cf6fd
parent0f90d0f3d30a728457e6bc5c4d1d933a8014e099
parent43f741ae3b8493e5b4e13f344894d4cf4932e609
fix conflict