Fix changed regression files

lebrice · lebrice · commit f4b68fcfe15e · 2024-01-31T14:52:12.000-05:00
Signed-off-by: Fabrice Normandin &lt;fabrice.normandin@gmail.com&gt;
diff --git a/test/test_subgroups/test_help[Config---help].md b/test/test_subgroups/test_help[Config---help].md
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # Regression file for [this test](test/test_subgroups.py:731)
+=======
+# Regression file for [this test](test/test_subgroups.py:736)
+>>>>>>> Fix changed regression files
 
 Given Source code:
 
diff --git a/test/test_subgroups/test_help[Config---model=model_a --help].md b/test/test_subgroups/test_help[Config---model=model_a --help].md
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # Regression file for [this test](test/test_subgroups.py:731)
+=======
+# Regression file for [this test](test/test_subgroups.py:736)
+>>>>>>> Fix changed regression files
 
 Given Source code:
 
diff --git a/test/test_subgroups/test_help[Config---model=model_b --help].md b/test/test_subgroups/test_help[Config---model=model_b --help].md
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # Regression file for [this test](test/test_subgroups.py:731)
+=======
+# Regression file for [this test](test/test_subgroups.py:736)
+>>>>>>> Fix changed regression files
 
 Given Source code:
 
diff --git a/test/test_subgroups/test_help[ConfigWithFrozen---conf=even --a 100 --help].md b/test/test_subgroups/test_help[ConfigWithFrozen---conf=even --a 100 --help].md
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # Regression file for [this test](test/test_subgroups.py:731)
+=======
+# Regression file for [this test](test/test_subgroups.py:736)
+>>>>>>> Fix changed regression files
 
 Given Source code:
 
diff --git a/test/test_subgroups/test_help[ConfigWithFrozen---conf=even --help].md b/test/test_subgroups/test_help[ConfigWithFrozen---conf=even --help].md
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # Regression file for [this test](test/test_subgroups.py:731)
+=======
+# Regression file for [this test](test/test_subgroups.py:736)
+>>>>>>> Fix changed regression files
 
 Given Source code:
 
diff --git a/test/test_subgroups/test_help[ConfigWithFrozen---conf=odd --a 123 --help].md b/test/test_subgroups/test_help[ConfigWithFrozen---conf=odd --a 123 --help].md
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # Regression file for [this test](test/test_subgroups.py:731)
+=======
+# Regression file for [this test](test/test_subgroups.py:736)
+>>>>>>> Fix changed regression files
 
 Given Source code:
 
diff --git a/test/test_subgroups/test_help[ConfigWithFrozen---conf=odd --help].md b/test/test_subgroups/test_help[ConfigWithFrozen---conf=odd --help].md
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # Regression file for [this test](test/test_subgroups.py:731)
+=======
+# Regression file for [this test](test/test_subgroups.py:736)
+>>>>>>> Fix changed regression files
 
 Given Source code:
 
diff --git a/test/test_subgroups/test_help[ConfigWithFrozen---help].md b/test/test_subgroups/test_help[ConfigWithFrozen---help].md
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # Regression file for [this test](test/test_subgroups.py:731)
+=======
+# Regression file for [this test](test/test_subgroups.py:736)
+>>>>>>> Fix changed regression files
 
 Given Source code:
 
