fix commit from samtech

Geo/GModel.h

@@ -18,26 +18,8 @@
 #include "SPoint3.h"
 #include "SBoundingBox3d.h"
 
-#include "GmshDefines.h"
-class Standard_EXPORT Octree;
-#include "GmshDefines.h"
-class Standard_EXPORT FM_Internals;
-#include "GmshDefines.h"
-class Standard_EXPORT GEO_Internals;
-#include "GmshDefines.h"
-class Standard_EXPORT OCC_Internals;
-#include "GmshDefines.h"
-class Standard_EXPORT smooth_normals;
-#include "GmshDefines.h"
-class Standard_EXPORT FieldManager;
-#include "GmshDefines.h"
-class Standard_EXPORT CGNSOptions;
-#include "GmshDefines.h"
-class Standard_EXPORT gLevelset;
-
 // A geometric model. The model is a "not yet" non-manifold B-Rep.
-#include "GmshDefines.h"
-class Standard_EXPORT GModel
+class GModel
 {
  private:
   // the name of the model

Geo/GModelIO_OCC.cpp

@@ -16,10 +16,6 @@
 #include "OpenFile.h"
 #include "OCC_Connect.h"
 
-<<<<<<< GModelIO_OCC.cpp
-
-=======
->>>>>>> 1.78
 #if defined(HAVE_OCC)
 
 void OCC_Internals::buildLists()
@@ -982,10 +978,6 @@ int GModel::importOCCShape(const void *shape)
   return 1;
 }
 
-<<<<<<< GModelIO_OCC.cpp
-
-=======
->>>>>>> 1.78
 #else
 
 void GModel::_deleteOCCInternals()