Commit 0b58067b authored by Pierre Lassalle's avatar Pierre Lassalle

Fix conflicts

parent b0c7c470
......@@ -22,16 +22,8 @@
namespace grm
{
template<class TImage>
<<<<<<< HEAD:src/grmBaatzSegmenter.txx
=======
BaatzSegmenter<TImage>::BaatzSegmenter() : Superclass()
{
}
template<class TImage>
>>>>>>> 46b42b66e5053b4108f0c7d195ca8c2fec976f9a:Code/lsrmBaatzSegmenter.txx
void
BaatzSegmenter<TImage>::InitFromImage()
{
......
......@@ -45,14 +45,9 @@ namespace grm
/* Default constructor and destructor */
Segmenter(){
<<<<<<< HEAD:src/grmSegmenter.h
this->m_DoFastSegmentation = false;
this->m_NumberOfIterations = 0;
this->m_Complete = false;
=======
this->m_DoBFSegmentation = true;
this->m_NumberOfIterations = 75;
>>>>>>> 46b42b66e5053b4108f0c7d195ca8c2fec976f9a:Code/lsrmSegmenter.h
};
~Segmenter(){};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment