[GRASS-SVN] r37570 - grass/branches/develbranch_6/lib/python

[svn_grass at osgeo.org]

Author: mlennert
Date: 2009-05-28 09:44:03 -0400 (Thu, 28 May 2009)
New Revision: 37570

Modified:
   grass/branches/develbranch_6/lib/python/core.py
Log:
last backport from trunk left svn merge info


Modified: grass/branches/develbranch_6/lib/python/core.py
===================================================================
--- grass/branches/develbranch_6/lib/python/core.py	2009-05-28 11:26:29 UTC (rev 37569)
+++ grass/branches/develbranch_6/lib/python/core.py	2009-05-28 13:44:03 UTC (rev 37570)
@@ -233,7 +233,6 @@
     @param env environment variable (default os.environ)
     @param kwargs
     """
->>>>>>> .merge-right.r37559
     args = make_command(prog, flags, overwrite, quiet, verbose, **kwargs)
     if env == None:
 	env = os.environ