Fix merge conflicts with main

2023-07-13 17:18:17 -07:00 · 2023-07-13 17:18:17 -07:00 · 7e121d224d
commit 7e121d224d
parent 8532ea5be8 1cc7b2178a
4 changed files with 17 additions and 18 deletions
--- a/rust-toolchain/flake.nix
+++ b/rust-toolchain/flake.nix
@ -23,14 +23,14 @@
      devShells = forEachSupportedSystem ({ pkgs }: {
        default = pkgs.mkShell {
          packages = with pkgs; [
-          rustToolchain
-          openssl
-          pkg-config
-          cargo-deny
-          cargo-edit
-          cargo-watch
-          rust-analyzer
-        ];
+            rustToolchain
+            openssl
+            pkg-config
+            cargo-deny
+            cargo-edit
+            cargo-watch
+            rust-analyzer
+          ];
        };
      });
    };