conflict in MacroReader resolved

AMDiS/src/io/MacroReader.cc

@@ -238,7 +238,11 @@ namespace AMDiS { namespace io {
             associated = mesh->periodicAssociations[boundaryType][iadmin];
 
             for (int j = 0; j < dim; j++) {
+<<<<<<< HEAD
 #ifndef NDEBUG
+=======
+#ifdef DEBUG
+>>>>>>> 7513d640d9de009c53e95dd9e1f252958172b31d
               {
                 unsigned initData(melVertex[el1][verticesEl1[j]]);
                 unsigned oldData((*associated)[melVertex[el1][verticesEl1[j]]]);
@@ -284,7 +288,11 @@ namespace AMDiS { namespace io {
         } // if
       } // for i
 
+<<<<<<< HEAD
 #ifndef NDEBUG
+=======
+#if (DEBUG != 0)
+>>>>>>> 7513d640d9de009c53e95dd9e1f252958172b31d
       std::map<BoundaryType, std::vector<VertexVector*> >::iterator assoc;
       std::map<BoundaryType, std::vector<VertexVector*> >::iterator assocEnd =
         mesh->periodicAssociations.end();