Commit 0b58067b3b2e46ffdff922b19da26cbfd10706eb

Authored by Pierre Lassalle
1 parent b0c7c470
Exists in master

Fix conflicts

Showing 2 changed files with 0 additions and 13 deletions   Show diff stats
src/grmBaatzSegmenter.txx
... ... @@ -22,16 +22,8 @@
22 22  
23 23 namespace grm
24 24 {
25   -
26   - template<class TImage>
27   -<<<<<<< HEAD:src/grmBaatzSegmenter.txx
28   -=======
29   - BaatzSegmenter<TImage>::BaatzSegmenter() : Superclass()
30   - {
31   - }
32 25  
33 26 template<class TImage>
34   ->>>>>>> 46b42b66e5053b4108f0c7d195ca8c2fec976f9a:Code/lsrmBaatzSegmenter.txx
35 27 void
36 28 BaatzSegmenter<TImage>::InitFromImage()
37 29 {
... ...
src/grmSegmenter.h
... ... @@ -45,14 +45,9 @@ namespace grm
45 45 /* Default constructor and destructor */
46 46  
47 47 Segmenter(){
48   -<<<<<<< HEAD:src/grmSegmenter.h
49 48 this->m_DoFastSegmentation = false;
50 49 this->m_NumberOfIterations = 0;
51 50 this->m_Complete = false;
52   -=======
53   - this->m_DoBFSegmentation = true;
54   - this->m_NumberOfIterations = 75;
55   ->>>>>>> 46b42b66e5053b4108f0c7d195ca8c2fec976f9a:Code/lsrmSegmenter.h
56 51 };
57 52 ~Segmenter(){};
58 53  
... ...