From f35fc4b76cb2e9d92f12f921c9c33309e025cbf1 Mon Sep 17 00:00:00 2001
From: Peter Boyle <paboyle@ph.ed.ac.uk>
Date: Sun, 29 Nov 2015 10:59:11 +0000
Subject: [PATCH] No compile fixes

---
 tests/Test_dwf_hdcr.cc | 4 ++--
 tests/Test_stencil.cc  | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/Test_dwf_hdcr.cc b/tests/Test_dwf_hdcr.cc
index eb247331..006d0e5e 100644
--- a/tests/Test_dwf_hdcr.cc
+++ b/tests/Test_dwf_hdcr.cc
@@ -6,7 +6,7 @@ using namespace std;
 using namespace Grid;
 using namespace Grid::QCD;
 
-class myclass {
+class myclass: Serializable {
 public:
 
   GRID_DECL_CLASS_MEMBERS(myclass,
@@ -446,7 +446,7 @@ int main (int argc, char ** argv)
 {
   Grid_init(&argc,&argv);
 
-  XMLReader RD("params.xml");
+  XmlReader RD("params.xml");
   read(RD,"params",params);
   std::cout<<"Params: Order "<<params.order<<"["<<params.lo<<","<<params.hi<<"]"<< " steps "<<params.steps<<std::endl;
 
diff --git a/tests/Test_stencil.cc b/tests/Test_stencil.cc
index 513e0750..26e52a41 100644
--- a/tests/Test_stencil.cc
+++ b/tests/Test_stencil.cc
@@ -62,11 +62,7 @@ int main (int argc, char ** argv)
 	std::vector<int> directions(npoint,dir);
 	std::vector<int> displacements(npoint,disp);
 
-<<<<<<< HEAD
-	CartesianStencil<vobj,vobj,SimpleCompressor<vobj> > myStencil(&Fine,npoint,0,directions,displacements);
-=======
 	Stencil myStencil(&Fine,npoint,0,directions,displacements);
->>>>>>> bc4b2528835e646fab1b186506b4740d97b02243
 
 	std::vector<int> ocoor(4);
 	for(int o=0;o<Fine.oSites();o++){