Fixed merge.
This commit is contained in:
parent
73b6cd1e70
commit
5a8d7905c6
@ -15,12 +15,9 @@
|
|||||||
devShells = {
|
devShells = {
|
||||||
default = pkgs.mkShell {
|
default = pkgs.mkShell {
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
<<<<<<< HEAD
|
|
||||||
snakemake
|
snakemake
|
||||||
gawk
|
gawk
|
||||||
=======
|
|
||||||
nickel
|
nickel
|
||||||
>>>>>>> 127c5c5ef4d0e7d4d1826007cdc27c903eb59314
|
|
||||||
(python3.withPackages (ps: with ps; [
|
(python3.withPackages (ps: with ps; [
|
||||||
requests
|
requests
|
||||||
pyyaml
|
pyyaml
|
||||||
|
Loading…
Reference in New Issue
Block a user