merge fix

examples/EMSchur3D.cpp

@@ -54,22 +54,6 @@ int main( int argc, char** argv ) {
 
     //////////////////////////////////////////////////
     // Read in Layered earth, for backgound model
-<<<<<<< HEAD
-//     auto LayEarthRead = LayeredEarthEMReader::NewSP();
-//         try {
-//             LayEarthRead->ReadASCIIInputFile( argv[2] );
-//         } catch (std::exception& e) {
-// 		    std::cout << "Caught an error opening ASCII Layered Earth file: ";
-//             std::cout << e.what() << std::endl;
-// 		    std::cout << "enter filename or 0 to exit programme\n";
-// 		    std::string inp;
-// 		    std::cin >> inp;
-// 		    if (inp != "0")
-//                 GridRead->ReadASCIIGridFile( inp.c_str() );
-//             else exit(EXIT_FAILURE);
-// 	    }
-=======
-    /*
     auto LayEarthRead = LayeredEarthEMReader::NewSP();
         try {
             LayEarthRead->ReadASCIIInputFile( argv[2] );
@@ -83,10 +67,7 @@ int main( int argc, char** argv ) {
                 GridRead->ReadASCIIGridFile( inp.c_str() );
             else exit(EXIT_FAILURE);
 	    }
-    */
->>>>>>> bd2e3fa6b0dbb11555df9d4e7a7fe68e29b61ffd
 
-    /*
     //////////////////////////////////////////////////
     // Read in source specification
     auto AEMRead = AEMSurveyReader::NewSP();
@@ -102,7 +83,7 @@ int main( int argc, char** argv ) {
                 AEMRead->ReadASCIIAEMFile( inp.c_str() );
             else exit(EXIT_FAILURE);
 	    }
-    */
+
 
     /*
     //////////////////////////////////////////////////

include/EMSchur3D.h

@@ -37,7 +37,7 @@ namespace Lemma {
     class EMSchur3D : public EMSchur3DBase {
 
         friend std::ostream &operator << (std::ostream &stream, const EMSchur3D &ob) {
-            stream << ob.Serialize()  << "\n---\n"; // End of doc
+            stream << ob.Serialize()  << "\n"; // End of doc
             return stream;
         }