Remove some senseless documentation cruft

EXP-code · Feb 4, 2025 · 575d863 · 575d863
1 parent 5a23973
commit 575d863
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/pyEXP/FieldWrappers.cc b/pyEXP/FieldWrappers.cc
@@ -399,10 +399,7 @@ void FieldGeneratorClasses(py::module &m) {
 
         See also
         --------
-<<<<<<< HEAD
-=======
         points : generate fields at an array of mesh points
->>>>>>> pointMesh
         slices : generate fields in a surface slice given by the
                  initializtion grid
         volumes : generate fields in volume given by the initializtion grid