python3Packages.hydra: fix bad merge conflict resolution

2 years ago · f7500b6f57
parent 71e415bf85
commit f7500b6f57
1 changed files with 0 additions and 1 deletions
--- 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; {