[GRASS-SVN] r37603 - grass/branches/releasebranch_6_4/lib/python

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-05-30 03:58:49 -0400 (Sat, 30 May 2009)
New Revision: 37603

Modified:
   grass/branches/releasebranch_6_4/lib/python/core.py
Log:
fix bad commit (badly fixed conflict)


Modified: grass/branches/releasebranch_6_4/lib/python/core.py
===================================================================
--- grass/branches/releasebranch_6_4/lib/python/core.py	2009-05-30 05:46:40 UTC (rev 37602)
+++ grass/branches/releasebranch_6_4/lib/python/core.py	2009-05-30 07:58:49 UTC (rev 37603)
@@ -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