From c8b0bc565840c86afe5f7adf662d51388cfc1a04 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 7 Apr 2025 17:24:41 -0400
Subject: [PATCH] format as required

(cherry picked from commit 9b47b2b21703a4c7cadf95f05bfc32b5146d8327)

# Conflicts:
#	src/libcmd/command.cc
---
 src/libcmd/command.cc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/libcmd/command.cc b/src/libcmd/command.cc
index 2947dcad8..0121e0384 100644
--- a/src/libcmd/command.cc
+++ b/src/libcmd/command.cc
@@ -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)
     });
 }