fix flake

f0ssel · f0ssel · commit c8a7c9ae9520 · 2024-08-23T18:30:01.000Z
diff --git a/flake.nix b/flake.nix
@@ -117,11 +117,7 @@
             name = "coder-${osArch}";
             # Updated with ./scripts/update-flake.sh`.
             # This should be updated whenever go.mod changes!
-<<<<<<< HEAD
             vendorHash = "sha256-fQsVoD/aRjVXmvQ/Pg4O9tpJCPlf3eC2uo0z0TU7AX8=";
-=======
-            vendorHash = "sha256-fQsVoD/aRjVXmvQ/Pg4O9tpJCPlf3eC2uo0z0TU7AX8=";
->>>>>>> main
             proxyVendor = true;
             src = ./.;
             nativeBuildInputs = with pkgs; [ getopt openssl zstd ];
