update unit test for MultiBlock class

2017-08-03 15:48:06 -04:00 · 2017-08-03 15:48:06 -04:00 · 9daade6883
commit 9daade6883
parent 2015387b9a
1 changed files with 0 additions and 1 deletions
--- a/vtkm/filter/FilterField.hxx
+++ b/vtkm/filter/FilterField.hxx
@ -80,7 +80,6 @@ inline VTKM_CONT std::vector<vtkm::filter::ResultField> FilterField<Derived>::Ex
 template <typename Derived>
 inline VTKM_CONT ResultField FilterField<Derived>::Execute(const vtkm::cont::DataSet& input,
                                                           const vtkm::cont::Field& field)
->>>>>>> 6eb38b4bded5d2f91aaefb9660930b941ffa4fd3
 {
  return this->Execute(input, field, vtkm::filter::PolicyDefault());
 }