[opencl] Ruggedness index OpenCL program

elpaso · elpaso · commit be5f1fd436ae · 2018-08-08T09:39:31.000+02:00
diff --git a/src/analysis/raster/qgsruggednessfilter.h b/src/analysis/raster/qgsruggednessfilter.h
@@ -47,7 +47,10 @@ class ANALYSIS_EXPORT QgsRuggednessFilter: public QgsNineCellFilter
     {
       return QStringLiteral( "ruggedness" );
     }
+<<<<<<< 8b81f1bb0993c3755019921eaa064d95f430c9db
 #endif
+=======
+>>>>>>> [opencl] Ruggedness index OpenCL program
 
 };
 

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,10 @@ class ANALYSIS_EXPORT QgsRuggednessFilter: public QgsNineCellFilter`
`47`	`47`	`{`
`48`	`48`	`return QStringLiteral( "ruggedness" );`
`49`	`49`	`}`
	`50`	`+<<<<<<< 8b81f1bb0993c3755019921eaa064d95f430c9db`
`50`	`51`	`#endif`
	`52`	`+=======`
	`53`	`+>>>>>>> [opencl] Ruggedness index OpenCL program`
`51`	`54`
`52`	`55`	`};`
`53`	`56`