Fix merge

Author: allywarner

src/Modules/Factory/ModuleFactoryImpl2.cc

@@ -95,10 +95,6 @@ void ModuleDescriptionLookup::addMoreModules()
   addModuleDesc<ConvertHexVolToTetVol>("ConvertHexVolToTetVol", "ChangeMesh", "SCIRun", "Real ported module", "...");
   addModuleDesc<BuildSurfaceLaplacianMatrix>("BuildSurfaceLaplacianMatrix","Inverse","SCIRun","...","...");
   addModuleDesc<ExtractSimpleIsosurfaceModule>("ExtractSimpleIsosurface","NewField","SCIRun","...","...");
-<<<<<<< HEAD
-  addModuleDesc<EvaluateLinearAlgebraGeneral>("Real ported module", "...");
   addModuleDesc<ComputePCA>("ComputePCA","Math","SCIRun","...","...");
-=======
   addModuleDesc<EvaluateLinearAlgebraGeneral>("Real ported module", "BUGGY--DO NOT USE");
->>>>>>> master
 }