[opencl] Ruggedness index OpenCL program

qgis · Aug 8, 2018 · be5f1fd · be5f1fd
1 parent 8b81f1b
commit be5f1fd
Showing 1 changed file with 3 additions and 0 deletions.
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
 
 };