[GRASS-SVN] r35800 - grass/branches/releasebranch_6_4/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: cmbarton
Date: 2009-02-07 17:42:05 -0500 (Sat, 07 Feb 2009)
New Revision: 35800

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/preferences.py
Log:
Fix bad commit

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/preferences.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/preferences.py	2009-02-07 22:40:42 UTC (rev 35799)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/preferences.py	2009-02-07 22:42:05 UTC (rev 35800)
@@ -1787,12 +1787,9 @@
         self.InsertColumn(0, _('Mapset'))
         self.InsertColumn(1, _('Owner'))
         self.InsertColumn(2, _('Group'))
-<<<<<<< .working
+
         locationPath = os.path.join(grassenv.GetGRASSVariable('GISDBASE'),
                                     grassenv.GetGRASSVariable('LOCATION_NAME'))
-=======
-        gisenv = grass.gisenv()
-        locationPath = os.path.join(gisenv['GISDBASE'], gisenv['LOCATION_NAME'])
 
         ret = grass.read_command('g.mapsets',
                                  flags = 'l')
@@ -1801,7 +1798,6 @@
         mapsets = []
         if ret:
             mapsets = ret.split()
->>>>>>> .merge-right.r35797
         
         for mapset in mapsets:
             index = self.InsertStringItem(sys.maxint, mapset)