]> git.puffer.fish Git - matthieu/nova.git/commit
resolve conflicts
authorMatthieu <matthieu@developershouse.xyz>
Sat, 7 Aug 2021 10:30:01 +0000 (14:30 +0400)
committerMatthieu <matthieu@developershouse.xyz>
Sat, 7 Aug 2021 10:30:01 +0000 (14:30 +0400)
commit25395461266f97063db70f19bf2c20115b3ee4ee
treeed76ca0b1c00f0358ec51a8ccd279abe5100bb8e
parent47d8443d202ab40897c8d08e1658748c581d73e7
parent797fa662df344cec4e344fb2769550536239283c
resolve conflicts