python3Packages.hydra: fix bad merge conflict resolution

This commit is contained in:
Jonathan Ringer 2022-01-07 11:21:35 -08:00
parent 71e415bf85
commit f7500b6f57
No known key found for this signature in database
GPG key ID: 5C841D3CFDFEC4E0

View file

@ -51,7 +51,6 @@ buildPythonPackage rec {
pythonImportsCheck = [
"hydra"
>>>>>>> origin/master
];
meta = with lib; {