wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 19:01:16 +02:00
Code Activity

Resolve conflict

Browse source
This commit is contained in:
Eelco Dolstra 2024-12-06 12:13:12 +01:00 • committed by GitHub
parent 6a8e9736e0
commit bd1b11ec66
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/nix/hash.cc
View file

@ -184,14 +184,9 @@ struct CmdToBase : Command
void run() override void run() override
{ {
<<<<<<< HEAD
warn("The old format conversion sub commands of `nix hash` were deprecated in favor of `nix hash convert`.");
for (auto s : args)
=======
if (!legacyCli) if (!legacyCli)
warn("The old format conversion subcommands of `nix hash` were deprecated in favor of `nix hash convert`."); warn("The old format conversion subcommands of `nix hash` were deprecated in favor of `nix hash convert`.");
for (const auto & s : args) for (const auto & s : args)
>>>>>>> 408c2faf9 (nix hash: Don't print 'nix hash' deprecation message)
logger->cout(Hash::parseAny(s, hashAlgo).to_string(hashFormat, hashFormat == HashFormat::SRI)); logger->cout(Hash::parseAny(s, hashAlgo).to_string(hashFormat, hashFormat == HashFormat::SRI));
} }
}; };