Fixed merge.

2024-07-16 10:32:54 +02:00 · 2024-07-16 10:32:54 +02:00 · 5a8d7905c6
commit 5a8d7905c6
parent 73b6cd1e70
1 changed files with 0 additions and 3 deletions
--- a/flake.nix
+++ b/flake.nix
@ -15,12 +15,9 @@
      devShells = {
        default = pkgs.mkShell {
          packages = with pkgs; [
-<<<<<<< HEAD
            snakemake
            gawk
-=======
            nickel
->>>>>>> 127c5c5ef4d0e7d4d1826007cdc27c903eb59314
            (python3.withPackages (ps: with ps; [
              requests
              pyyaml