Bad merge

tveasey · tveasey · commit 893f0b26f8e1 · 2018-03-23T15:34:01.000Z
diff --git a/lib/maths/CTimeSeriesModel.cc b/lib/maths/CTimeSeriesModel.cc
@@ -2835,7 +2835,7 @@ const CMultivariateTimeSeriesModel::TTimeDouble2VecPrCBuf &CMultivariateTimeSeri
     return m_SlidingWindow;
 }
 
-const CMultivariateTimeSeriesModel::TDecompositionPtr10Vec &CMultivariateTimeSeriesModel::trend(void) const
+const CMultivariateTimeSeriesModel::TDecompositionPtr10Vec &CMultivariateTimeSeriesModel::trendModel(void) const
 {
     return m_TrendModel;
 }

Original file line number	Diff line number	Diff line change
`@@ -2835,7 +2835,7 @@ const CMultivariateTimeSeriesModel::TTimeDouble2VecPrCBuf &CMultivariateTimeSeri`
`2835`	`2835`	`return m_SlidingWindow;`
`2836`	`2836`	`}`
`2837`	`2837`
`2838`		`-const CMultivariateTimeSeriesModel::TDecompositionPtr10Vec &CMultivariateTimeSeriesModel::trend(void) const`
	`2838`	`+const CMultivariateTimeSeriesModel::TDecompositionPtr10Vec &CMultivariateTimeSeriesModel::trendModel(void) const`
`2839`	`2839`	`{`
`2840`	`2840`	`return m_TrendModel;`
`2841`	`2841`	`}`