From f7500b6f57949425bb594e79fe8e25ec93842a94 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 7 Jan 2022 11:21:35 -0800 Subject: [PATCH] python3Packages.hydra: fix bad merge conflict resolution --- pkgs/development/python-modules/hydra/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/hydra/default.nix b/pkgs/development/python-modules/hydra/default.nix index 473a88d80dc2..645df973fa6a 100644 --- a/pkgs/development/python-modules/hydra/default.nix +++ b/pkgs/development/python-modules/hydra/default.nix @@ -51,7 +51,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "hydra" ->>>>>>> origin/master ]; meta = with lib; {