From 582d015eaf5b009a4aefd7871fea3c1e5b163ef1 Mon Sep 17 00:00:00 2001
From: bgbsww <bgbsww@gmail.com>
Date: Tue, 20 Feb 2024 14:23:01 -0500
Subject: [PATCH] Clean and add tests for makeElementSolid

---
 src/Mod/Part/App/TopoShapeExpansion.cpp       | 1 +
 tests/src/Mod/Part/App/TopoShapeExpansion.cpp | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Mod/Part/App/TopoShapeExpansion.cpp b/src/Mod/Part/App/TopoShapeExpansion.cpp
index 0ce927e884..fe8c7a52aa 100644
--- a/src/Mod/Part/App/TopoShapeExpansion.cpp
+++ b/src/Mod/Part/App/TopoShapeExpansion.cpp
@@ -52,6 +52,7 @@
 #include <BRepBuilderAPI_GTransform.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
+#include <BRepBuilderAPI_MakeSolid.hxx>
 #include <BRepBuilderAPI_NurbsConvert.hxx>
 #include <BRepBuilderAPI_Transform.hxx>
 #include <BRepBuilderAPI_MakeSolid.hxx>
diff --git a/tests/src/Mod/Part/App/TopoShapeExpansion.cpp b/tests/src/Mod/Part/App/TopoShapeExpansion.cpp
index 60a5a99129..bf15036f4e 100644
--- a/tests/src/Mod/Part/App/TopoShapeExpansion.cpp
+++ b/tests/src/Mod/Part/App/TopoShapeExpansion.cpp
@@ -1767,7 +1767,6 @@ TEST_F(TopoShapeExpansionTest, makeElementCut)
             "CUT;:H1:7,V);CUT;:H1:3c,E|Face6;:M;CUT;:H1:7,F;:U2;CUT;:H1:8,E);CUT;:H1:cb,F"));
 }
 
-<<<<<<< HEAD
 TEST_F(TopoShapeExpansionTest, makeElementChamfer)
 {
     // Arrange
@@ -2645,6 +2644,4 @@ TEST_F(TopoShapeExpansionTest, traceElement)
         }));
 }
 
-=======
->>>>>>> f6b3402577 (Toposhape/Part: Clean GeneralFuse, Fuse, Cut; add tests; tweak other tests)
 // NOLINTEND(readability-magic-numbers,cppcoreguidelines-avoid-magic-numbers)