[GRASS-SVN] r68367 - grass/trunk/scripts/r.fillnulls

[svn_grass at osgeo.org]

Author: zarch
Date: 2016-05-02 09:12:08 -0700 (Mon, 02 May 2016)
New Revision: 68367

Modified:
   grass/trunk/scripts/r.fillnulls/r.fillnulls.py
Log:
Fix conflict string

Modified: grass/trunk/scripts/r.fillnulls/r.fillnulls.py
===================================================================
--- grass/trunk/scripts/r.fillnulls/r.fillnulls.py	2016-05-02 16:12:03 UTC (rev 68366)
+++ grass/trunk/scripts/r.fillnulls/r.fillnulls.py	2016-05-02 16:12:08 UTC (rev 68367)
@@ -134,12 +134,7 @@
     segmax = int(options['segmax'])
     npmin = int(options['npmin'])
     lambda_ = float(options['lambda'])
-<<<<<<< 1ca5ade0f050cc22722fdcbb57af91135215607e
-    quiet = True # FIXME
-
-=======
     quiet = True  # FIXME
->>>>>>> scripts modules: support python3
     mapset = grass.gisenv()['MAPSET']
     unique = str(os.getpid())  # Shouldn't we use temp name?
     prefix = 'r_fillnulls_%s_' % unique