mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-08 13:23:51 +00:00
Resolving conflict marker
This commit is contained in:
parent
2f2230d1f4
commit
3c9413345d
@ -171,15 +171,9 @@ private:
|
||||
CellSetPortal CellSet;
|
||||
RectilinearPortalType Coords;
|
||||
AxisPortalType AxisPortals[3];
|
||||
<<<<<<< HEAD
|
||||
vtkm::Vec<vtkm::Id, dimensions> PointDimensions;
|
||||
vtkm::Vec<vtkm::FloatDefault, 3> MinPoint;
|
||||
vtkm::Vec<vtkm::FloatDefault, 3> MaxPoint;
|
||||
=======
|
||||
vtkm::Id3 PointDimensions;
|
||||
vtkm::Vec3f MinPoint;
|
||||
vtkm::Vec3f MaxPoint;
|
||||
>>>>>>> 57440239efe51fbcced830488cdf80b683f3d9ea
|
||||
};
|
||||
} //namespace exec
|
||||
} //namespace vtkm
|
||||
|
Loading…
Reference in New Issue
Block a user