Fix errors in rebase merge.

src/ifcgeom/IfcGeomIteratorSettings.h

@@ -78,9 +78,8 @@ namespace IfcGeom
             GENERATE_UVS = 1 << 12,
             /// Specifies whether to slice representations according to associated IfcLayerSets.
             APPLY_LAYERSETS = 1 << 13,
-            TRAVERSE = 1 << 14,
             /// Number of different setting flags.
-            NUM_SETTINGS = 14
+            NUM_SETTINGS = 13
         };
         /// Used to store logical OR combination of setting flags.
         typedef unsigned SettingField;