Bindings for 9cell filter

qgis · Aug 8, 2018 · be21ea8 · be21ea8
1 parent 528302c
commit be21ea8
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/python/analysis/auto_generated/raster/qgsninecellfilter.sip.in b/python/analysis/auto_generated/raster/qgsninecellfilter.sip.in
@@ -36,11 +36,15 @@ Starts the calculation, reads from mInputFile and stores the result in mOutputFi
 :param feedback: feedback object that receives update and that is checked for cancelation.
 
 :return: 0 in case of success
+<<<<<<< 528302cc8952497513b44423dfca6fcf4857760c
 <<<<<<< d6e747ca57807318c0b3f6be8266f0b43c0f7747
          TODO: return an enum
 =======
 TODO: return an enum
 >>>>>>> More updates for opencl
+=======
+         TODO: return an enum
+>>>>>>> Bindings for 9cell filter
 %End
 
     double cellSizeX() const;