From: MatthieuCoder <matthieu@matthieu-dev.xyz>
Date: Tue, 3 Jan 2023 11:39:23 +0000 (+0400)
Subject: conflicts
X-Git-Tag: v0.1~20
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9593f5e56e90b5b4d41ad1e792489de336dc2c37;p=matthieu%2Fnova.git

conflicts
---

9593f5e56e90b5b4d41ad1e792489de336dc2c37
diff --cc .github/workflows/build.yml
index 2d293fa,dd658fd..cfb3bab
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@@ -63,9 -63,9 +63,9 @@@ jobs
          uses: ATiltedTree/setup-rust@v1
          with:
            rust-version: stable
-         - uses: actions/setup-go@v3
-           with:
-             go-version: '1.18.4' # The Go version to download (if necessary) and use.
+       - uses: actions/setup-go@v3
+         with:
 -          go-version: '1.16.1' # The Go version to download (if necessary) and use.
++          go-version: '1.18.4' # The Go version to download (if necessary) and use.
        - name: Build | Compile
          run: cargo build --release
        - name: Build | All in one