Bad merge

tveasey · tveasey · commit cf486348e0ba · 2018-03-23T15:34:01.000Z
diff --git a/lib/maths/CTimeSeriesModel.cc b/lib/maths/CTimeSeriesModel.cc
@@ -2844,7 +2844,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
`@@ -2844,7 +2844,7 @@ const CMultivariateTimeSeriesModel::TTimeDouble2VecPrCBuf &CMultivariateTimeSeri`
`2844`	`2844`	`return m_SlidingWindow;`
`2845`	`2845`	`}`
`2846`	`2846`
`2847`		`-const CMultivariateTimeSeriesModel::TDecompositionPtr10Vec &CMultivariateTimeSeriesModel::trend(void) const`
	`2847`	`+const CMultivariateTimeSeriesModel::TDecompositionPtr10Vec &CMultivariateTimeSeriesModel::trendModel(void) const`
`2848`	`2848`	`{`
`2849`	`2849`	`return m_TrendModel;`
`2850`	`2850`	`}`