Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Resolving conflict marker

Browse Source
This commit is contained in:
ayenpure 2019-07-31 15:10:32 -06:00
parent 2f2230d1f4
commit 3c9413345d
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtkm/exec/CellLocatorRectilinearGrid.h
View File

@ -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