nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-04-15 13:47:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

format as required

Browse Source 
(cherry picked from commit 9b47b2b217)

# Conflicts:
#	src/libcmd/command.cc
This commit is contained in:
Graham Christensen 2025-04-07 17:24:41 -04:00 committed by Mergify
parent 1c9d3fd2f8
commit c8b0bc5658
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libcmd/command.cc
View File

@ -240,6 +240,7 @@ MixProfile::MixProfile()
{
addFlag({
.longName = "profile",
<<<<<<< HEAD
<<<<<<< HEAD
.description = "The profile to operate on.",
.labels = {"path"},
@ -251,6 +252,12 @@ MixProfile::MixProfile()
.handler = {&profile},
.completer = completePath,
>>>>>>> 06acbd37b (Add trailing commas on addFlag incantations)
=======
.description = "The profile to operate on.",
.labels = {"path"},
.handler = {&profile},
.completer = completePath,
>>>>>>> 9b47b2b21 (format as required)
});
}