Merge fixes

allywarner · allywarner · commit 771e030c5c3b · 2015-07-16T14:43:07.000-06:00
diff --git a/src/Core/Algorithms/Factory/HardCodedAlgorithmFactory.cc b/src/Core/Algorithms/Factory/HardCodedAlgorithmFactory.cc
@@ -184,17 +184,13 @@ void HardCodedAlgorithmFactory::addToMakerMap()
 	    ADD_MODULE_ALGORITHM(ComputeSVD, ComputeSVDAlgo)
 		  ADD_MODULE_ALGORITHM(ConvertMatrixToString, ConvertMatrixToStringAlgo)
       ADD_MODULE_ALGORITHM(ConvertHexVolToTetVol, ConvertMeshToTetVolMeshAlgo)
-<<<<<<< HEAD
      ADD_MODULE_ALGORITHM(ExtractSimpleIsosurface, ExtractSimpleIsosurfaceAlgo)
 	 ADD_MODULE_ALGORITHM(RegisterWithCorrespondences, RegisterWithCorrespondencesAlgo)
       ADD_MODULE_ALGORITHM(ComputePCA, ComputePCAAlgo)
-    ;
-=======
       ADD_MODULE_ALGORITHM(ExtractSimpleIsosurface, ExtractSimpleIsosurfaceAlgo)
 	    ADD_MODULE_ALGORITHM(RegisterWithCorrespondences, RegisterWithCorrespondencesAlgo)
       ADD_MODULE_ALGORITHM(ClipVolumeByIsovalue, ClipMeshByIsovalueAlgo)
      ;
->>>>>>> master
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -184,17 +184,13 @@ void HardCodedAlgorithmFactory::addToMakerMap()`
`184`	`184`	`ADD_MODULE_ALGORITHM(ComputeSVD, ComputeSVDAlgo)`
`185`	`185`	`ADD_MODULE_ALGORITHM(ConvertMatrixToString, ConvertMatrixToStringAlgo)`
`186`	`186`	`ADD_MODULE_ALGORITHM(ConvertHexVolToTetVol, ConvertMeshToTetVolMeshAlgo)`
`187`		`-<<<<<<< HEAD`
`188`	`187`	`ADD_MODULE_ALGORITHM(ExtractSimpleIsosurface, ExtractSimpleIsosurfaceAlgo)`
`189`	`188`	`ADD_MODULE_ALGORITHM(RegisterWithCorrespondences, RegisterWithCorrespondencesAlgo)`
`190`	`189`	`ADD_MODULE_ALGORITHM(ComputePCA, ComputePCAAlgo)`
`191`		`- ;`
`192`		`-=======`
`193`	`190`	`ADD_MODULE_ALGORITHM(ExtractSimpleIsosurface, ExtractSimpleIsosurfaceAlgo)`
`194`	`191`	`ADD_MODULE_ALGORITHM(RegisterWithCorrespondences, RegisterWithCorrespondencesAlgo)`
`195`	`192`	`ADD_MODULE_ALGORITHM(ClipVolumeByIsovalue, ClipMeshByIsovalueAlgo)`
`196`	`193`	`;`
`197`		`->>>>>>> master`
`198`	`194`	`}`
`199`	`195`	`}`
`200`	`196`